Google Maps API
merged changes