Don't block thread forever
Merge pull request #87 from WIgor/3.3

Don't block thread forever