diff --git a/js/marker.js b/js/marker.js
index aef247f..3a7d313 100644
--- a/js/marker.js
+++ b/js/marker.js
@@ -58,61 +58,64 @@ Drupal.gmap.addHandler('gmap', function (elem) {
 
   // Default marker actions.
   obj.bind('clickmarker', function (marker) {
-    // Local/stored content
-    if (marker.text) {
-      marker.marker.openInfoWindowHtml(marker.text);
-    }
-    // Info Window Query / Info Window Offset
-    if (marker.iwq || (obj.vars.iwq && typeof marker.iwo != 'undefined')) {
-      var iwq, iwo;
-      if (obj.vars.iwq) {
-        iwq = obj.vars.iwq;
-      }
-      if (marker.iwq) {
-        iwq = marker.iwq;
+    // If Marker action is not set to Do nothing go ahead 
+    if (obj.vars.markermode !== '0') {
+      // Local/stored content
+      if (marker.text) {
+        marker.marker.openInfoWindowHtml(marker.text);
       }
-      iwo = 0;
-      if (marker.iwo) {
-        iwo = marker.iwo;
+      // Info Window Query / Info Window Offset
+      if (marker.iwq || (obj.vars.iwq && typeof marker.iwo != 'undefined')) {
+        var iwq, iwo;
+        if (obj.vars.iwq) {
+          iwq = obj.vars.iwq;
+        }
+        if (marker.iwq) {
+          iwq = marker.iwq;
+        }
+        iwo = 0;
+        if (marker.iwo) {
+          iwo = marker.iwo;
+        }
+        // Create a container to store the cloned DOM elements.
+        var el = document.createElement('div');
+        // Clone the matched object, run through the clone, stripping off ids, and move the clone into the container.
+        jQuery(iwq).eq(iwo).clone(false).find('*').removeAttr('id').appendTo(jQuery(el));
+        marker.marker.openInfoWindow(el);
       }
-      // Create a container to store the cloned DOM elements.
-      var el = document.createElement('div');
-      // Clone the matched object, run through the clone, stripping off ids, and move the clone into the container.
-      jQuery(iwq).eq(iwo).clone(false).find('*').removeAttr('id').appendTo(jQuery(el));
-      marker.marker.openInfoWindow(el);
-    }
-    // AJAX content
-    if (marker.rmt) {
-      var uri = marker.rmt;
-      // If there was a callback, prefix that.
-      // (If there wasn't, marker.rmt was the FULL path.)
-      if (obj.vars.rmtcallback) {
-        uri = obj.vars.rmtcallback + '/' + marker.rmt;
+      // AJAX content
+      if (marker.rmt) {
+        var uri = marker.rmt;
+        // If there was a callback, prefix that.
+        // (If there wasn't, marker.rmt was the FULL path.)
+        if (obj.vars.rmtcallback) {
+          uri = obj.vars.rmtcallback + '/' + marker.rmt;
+        }
+        // @Bevan: I think it makes more sense to do it in this order.
+        // @Bevan: I don't like your choice of variable btw, seems to me like
+        // @Bevan: it belongs in the map object, or at *least* somewhere in
+        // @Bevan: the gmap settings proper...
+        //if (!marker.text && Drupal.settings.loadingImage) {
+        //  marker.marker.openInfoWindowHtml(Drupal.settings.loadingImage);
+        //}
+        jQuery.get(uri, {}, function (data) {
+          marker.marker.openInfoWindowHtml(data);
+        });
       }
-      // @Bevan: I think it makes more sense to do it in this order.
-      // @Bevan: I don't like your choice of variable btw, seems to me like
-      // @Bevan: it belongs in the map object, or at *least* somewhere in
-      // @Bevan: the gmap settings proper...
-      //if (!marker.text && Drupal.settings.loadingImage) {
-      //  marker.marker.openInfoWindowHtml(Drupal.settings.loadingImage);
-      //}
-      jQuery.get(uri, {}, function (data) {
-        marker.marker.openInfoWindowHtml(data);
-      });
-    }
-    // Tabbed content
-    else if (marker.tabs) {
-      var infoWinTabs = [];
-      for (var m in marker.tabs) {
-        if (marker.tabs.hasOwnProperty(m)) {
-          infoWinTabs.push(new GInfoWindowTab(m, marker.tabs[m]));
+      // Tabbed content
+      else if (marker.tabs) {
+        var infoWinTabs = [];
+        for (var m in marker.tabs) {
+          if (marker.tabs.hasOwnProperty(m)) {
+            infoWinTabs.push(new GInfoWindowTab(m, marker.tabs[m]));
+          }
         }
+        marker.marker.openInfoWindowTabsHtml(infoWinTabs);
+      }
+      // No content -- marker is a link
+      else if (marker.link) {
+        open(marker.link, '_self');
       }
-      marker.marker.openInfoWindowTabsHtml(infoWinTabs);
-    }
-    // No content -- marker is a link
-    else if (marker.link) {
-      open(marker.link, '_self');
     }
   });
 
