Merge branch 'master-test' into tmp

Merge pull request #5 from subuk/master

Fix assertion error if tcp timeouts more than 1 second