issue/#46

fixes #46
Merge pull request #47 from hrajotia/develop

issue/#46