Merge pull request #15 from brainsail/master

Fixes #10