Merge pull request #160 from mpeuster/master

Cleanup and bugfixes