Merge pull request #3 from kupferwerk/master

fetching upstream
Merge pull request #8 from jleidgens/master

Merge pull request #3 from kupferwerk/master