Update google map options
Merge branch 'chris'