Merge pull request #30 from maxschaf/newtestset

Newtestset
Merge pull request #31 from maxschaf/master

ss