Merge pull request #12 from philippschumann/master

philippschumann
Merge pull request #13 from philippschumann/Kalrog

Merge pull request #12 from philippschumann/master