Merge pull request #133 from mpeuster/master

Preparations for open source release