Merge pull request #1 from Twiek/testbranch

Testbranch
What did I do?