Merge pull request #67 from JanMalte/unittests

added some more Unittests
Merge branch 'master' into unittests