Minor reorg of code
Merge branch 'master' of https://github.com/skavan/UPnPDeviceSpyVB.git