Merge from forks: Add GPS support