Merge pull request #55 from Taluu/refacto-3.0

Refacto 3.0
Add a timeout on the stream socket connection