Udp support for  2.x-maintenance

More: #9 
indentation