Merge pull request #42 from aheld84/master

Fixes #41
Fix: fixes #43