Refactored identification and added protection to getVoltServer
Merge branch 'master' of https://github.com/Falkirks/Volt