Fixes #35
Merge pull request #44 from filamentgroup/issue-35

Fixes #35