Merge pull request #73 from marcSchneiter/master

clean up