Fully added geoliocation
Fully added geoliocation| Merged