gps fix-up part 2
Merge pull request #1 from eugene373/cm-10.1

gps fix-up part 2