Fixes #94
Merge pull request #7 from mtoma/fix-issue-94

Fixes #94