Merge pull request #71 from blabaere/master

Adds multithread tests