Merge pull request #28 from cdinu/master

Closes #26. Work on #25.
Merge pull request #29 from cdinu/master

Add web tracking
Fix gps bug