Edits to UDPSender
2nd merge, Joel needs to pull and push
Merge remote-tracking branch 'origin/master'