Issue no. 18

Read issue here