Issue no. 16

Read issue here