Udp support for  2.x-maintenance

More: #9 
remove tags (see other comments about javadoc formatting)