Merge pull request #8 from SystemFehler/master

test
Merge pull request #9 from SystemFehler/hotfix_feature1

Merge pull request #8 from SystemFehler/master