fixed deadlock
Merge branch 'master' into nook