Closes #5
Fixes #9