Merge pull request #406 from leider/master

cleanups