Merge pull request #2 from janniklorenz/master

Merge