Fix: fixes #41
Merge pull request #42 from aheld84/master

Fixes #41