timeout in BlockResolver
Merge branch 'master' of https://github.com/wmin0/Doopey