Issue no. 21

Read issue here