Merge 'tcpserver'. Closes #40