my changes
Merge https://github.com/developerc/P1384_Location