Merge pull request #1 from HolgerNeubauer/Testfile-3-branch

Testfile 3 branch