Revert to using a TCP server as per #40
Merge branch 'tcpserver'