Fixes #103
Merge pull request #129 from kkasravi/master

Fixes #103