Works, but needs teesting before merging
Fixes #10

tested and works well