Merge pull request #12 from philippschumann/master

philippschumann