geo
Merge pull request #98 from diego04/master

geolocation part 1