GPS UPdates
Merge branch 'grant' into eric