Merge pull request #106 from lburgazzoli/master

CHRON-56 Refactor TCP layer, minor cleanup