Updated to use the latest SocketStream in master