merged latest code from Ingmar Schneider. TODO: cleanup tcpServer files.