Fix: fixes #37
Fix: fixes #38
Merge pull request #39 from aheld84/master

Fixes #37 and #38