Udp support for  2.x-maintenance

More: #9 
sorry, didn't notice this typo in the last review.