fixed up issue with the udp server/client (in makeUdpClient)
merged fixed conflict with version