add no block check; based on patch from h2so5; close #1174
Merge branch 'master' into iij