Merge pull request #7 from philippschumann/philippschumann

Philippschumann
Merge pull request #8 from philippschumann/master

philippschumann
Merge pull request #9 from philippschumann/Kalrog

Merge pull request #8 from philippschumann/master
Merge pull request #10 from philippschumann/master

philippschumann