Bug fix for client blocking
Merge pull request #1 from amhndu/master

Bug fix for client blocking