Added missing timeout in socket connections.
Add missing timeout.
Remove obsolete comment.
Merge pull request #138 from romainreuillon/timeouts

Timeouts