Merge pull request #275 from kdarbyshirebryant/upnp