issue/#41

fixes #41
issue/#43

fixes #43
Merge pull request #42 from hrajotia/develop

issue/#41