Fix #17
Merge pull request #67 from deepj/fix-gh17

Fix #17