Merge pull request #34 from aheld84/master

Fixes #19
Fix: fixes #35