Fixed bugs in connection timeout implementation
Merge pull request #53 from finian/master

Fixed bugs in connection timeout implementation