Revert "Revert "First attempt at fixing #43""
Merge pull request #47 from brainly/revert-46-revert-42-tcp-fixes

Revert "Revert "First attempt at fixing #43""