Fixing timedout connections
Merge pull request #109 from ipeirotis/master

Fixing timed out connections