Fixes to #81
Merge pull request #83 from rupaheizu/patch-1

Fixed issue #81.