Closes #160
Cleanup