Fixes #35
Closes #34