Issue #18 -  Add Datagram support

Issue #18 - Add Datagram support