Merge pull request #17 from aheld84/master

Fixes #15