connection and socket timeouts
Merging pull request #29
Merge branch 'acadeu-master'