Adding tcp/udp client
fixed merge