Merge pull request #36 from aheld84/master

Fixes #35
Fix: fixes #37
Fix: fixes #38