Merge pull request #8 from philippschumann/master

philippschumann