Fixes #65
Merge pull request #83 from Mibew/connection_timeout

Fixes #65