No GPS handling
Conflict resolution
Merge pull request #10 from cts12/feature/simon

No GPS handling