Fix issue #64
Merge pull request #65 from ted0000/feature/issue-64

Fixes #64