my changes
Merge https://github.com/developerc/P1383_Location
second changes