Merge pull request #14 from brainsail/develop

Fixes #10