Issue/#23
Merge pull request #24 from hrajotia/issue/#23

Issue/#23