Merge pull request #39 from aheld84/master

Fixes #37 and #38
Fix: fixes #41