Added UPnP Support
Added auto-selection of UPnP or NAT-PMP