Udp support for  2.x-maintenance

More: #9 
One more nit: Pull this up to be one line.