Fix #3
Fix #1
Merge pull request #6 from mayhew-luke/develop

new test