added geolocation
Merge remote-tracking branch 'upstream/master'

Merged upstream.