Fixes #10 impl
Fixes #10 tests
Merge pull request #11 from rotty3000/fixes#10

Fixes #10 tests