Merge pull request #6 from johannesneuhold/master

push to johannes