Fixes possible deadlock in threads.
Added entry to CONTRIBUTORS.txt.
Merge pull request #171 from schlamar/test-fixes

Fixes possible deadlock in threads.