updating geolocation
merge with master