Merge pull request #1 from amhndu/master

Bug fix for client blocking
Updated Server and Client code
Updated Server and Client code