issue/#61

fixes #61
Merge pull request #62 from hrajotia/develop

issue/#61