Fixes #7
Closes #3