4.1.0

Bleeding-edge branch for advanced stuff including upnp as suggested by @SharkHunter