Merge pull request #77 from jvoigtlaender/master

further cleaning up