Merge pull request #372 from TheBlueMatt/upnp