minor refactor to location loader
minor change to last refactor
Merge branch 'master' of https://github.com/Valtech-NAS/Beta