Merge pull request #221 from mpeuster/master

Cleanups and fixes for upcoming v2.1