Merge pull request #6 from SystemFehler/master

testbranch