Testcommit 3.0
Merge pull request #1 from PhilippSteiner/Philipp

1. Merge