corrected a lot of deadlock conditions
v0.0.5
Merge branch 'master' into joint-consensus