Fix non-blocking problem introduced with 0.4.1
Fix non-blocking problem introduced with 0.5
Martin Ortbauer
Merge branch 'mortbauer-master'