Closes #81
Fixes #82