Fixes #59
Closes #61