Add use of geolocation
Merge