Udp support for  2.x-maintenance

More: #9 
line length is 100, so this should fit on a single line