Merge pull request #60 from romainreuillon/timeout

Add missing timeouts.
Secure socket remove.
Add missing timeouts.
Merge branch 'socketpool' into dev