diff --git a/client/scripts/index.js b/client/scripts/index.js
index b033a313..74c7d2cf 100755
--- a/client/scripts/index.js
+++ b/client/scripts/index.js
@@ -33,12 +33,16 @@ var Body = React.createClass({
 
   _handle_marker_click () {
     console.log("_handle_marker_click");
+    this.setState({
+      zoom: (this.state.zoom || this.props.zoom)+1
+    });
   },
 
   _render (props, state) {
+    console.log('render', state);
     return <div>
       <Map  center={props.center}
-            zoom={props.zoom}
+            zoom={state.zoom || props.zoom}
             mapTypeId={props.mapTypeId}
             onClick={this._handle_map_click} />
       <Marker position={props.center}
diff --git a/src/Map.js b/src/Map.js
index 1dbc5937..29243937 100644
--- a/src/Map.js
+++ b/src/Map.js
@@ -31,8 +31,11 @@ module.exports = React.createClass({
   componentDidUpdate () {
     var {context} = this;
     if (!context.getApi()) return;
-    if (context.hasMap()) return;
-    this.add_listeners(this._init_map());
+    if (context.hasMap()) {
+      this.context.getMap().setOptions(this.props);
+    } else {
+      this.add_listeners(this._init_map());
+    }
   },
 
   componentWillUnmount () {