Fixes issues related with #17
Merge pull request #24 from mktums/patch-1

Fixes issues related with #17