Merge pull request #3 from kupferwerk/master

fetching upstream