issue/#25

fixes #25
Merge pull request #26 from hrajotia/develop

issue/#25