fixed #37
Merge pull request #38 from rashivkp/develop

Develop