Adding changes as per asthan's comments.
Merge pull request #53 from viig99/master

Fixes #50