gpx improvements
Approaching the demo
Merge pull request #1 from joaobiriba/master

Update from joao