Added more tests and cleaned up the code a bit with Josh Larsen
Merge pull request #9 from maxnachlinger/deadlockRetry

Added more tests and cleaned up the code a bit with Josh Larsen