Fix: fixes #35
Merge pull request #36 from aheld84/master

Fixes #35