Issue no. 25

Read issue here