Merge pull request #6 from SystemFehler/master

testbranch
Merge pull request #7 from SystemFehler/feature1

Merge pull request #6 from SystemFehler/master