added TCPConnection
mergefix