Merge pull request #16 from aheld84/master

Fixes #14