Fix messed up where clause
Updated windows batch script
Merge branch 'master' into upnp-portmapping