Readded accidentally deleted files
Merge pull request #3 from Twiek/testbranch

Readded accidentally deleted files