Geolocation

Bringing newest changes into master