Merge pull request #6 from johannesneuhold/master

push to johannes
Merge pull request #4 from MarcoRieger/master

Merge pull request #6 from johannesneuhold/master