fixed blocking issue
Merge pull request #1 from dperny/master

fixed blocking issue