diff --git a/sites/default/modules/gmap/gmap_plugin_style_gmap.inc b/sites/default/modules/gmap/gmap_plugin_style_gmap.inc
index 5bc5166..f47b1e9 100644
--- a/sites/default/modules/gmap/gmap_plugin_style_gmap.inc
+++ b/sites/default/modules/gmap/gmap_plugin_style_gmap.inc
@@ -51,6 +51,8 @@ class gmap_plugin_style_gmap extends views_plugin_style {
       vpr('gmap_plugin_style_gmap: Missing row plugin');
       return;
     }
+    
+    $defaults = gmap_defaults();
 
     $markername = isset($this->options['markertype']) ? $this->options['markertype'] : 'drupal';
 
@@ -85,13 +87,19 @@ class gmap_plugin_style_gmap extends views_plugin_style {
           if (!isset($offsets[$markername])) {
             $offsets[$markername] = 0;
           }
-          $markers[] = array(
+          $marker = array(
             'latitude' => $lat,
             'longitude' => $lon,
             'markername' => $markername,
             'offset' => $offsets[$markername],
-            'text' => $this->row_plugin->render($row),
           );
+          if ($defaults['markermode'] == 1) { // popup
+            $marker['text'] = $this->row_plugin->render($row);
+          }
+          else if ($defaults['markermode'] == 2) { // link
+            $marker['link'] = url('node/'. $row->nid);
+          }
+          $markers[] = $marker;
           $offsets[$markername]++;
         }
       }