Merge pull request #135 from mpeuster/master

Cleanup for 0.9 release