Add README
Fix deadlock detection code
Merge branch 'master' into gh-pages