gps (will not compile)
improve GPS handling
Merge branch 'GPS' into develop