Fixes #20
Merge pull request #21 from hrajotia/issue/#20

Issue/#20