minor bug
Cleaning up...
Closes #37