Cleanup

References #144
Merge branch 'master' into geezer