diff --git a/staticmap.module b/staticmap.module
index f57fcf8..9b1a2ef 100644
--- a/staticmap.module
+++ b/staticmap.module
@@ -96,6 +96,7 @@ function staticmap_field_formatter_info() {
       'field types' => array_keys(staticmap_load_field_info()),
       'settings' => array(
         'preset' => '',
+        'link_to_map' => 1,
       ),
     ),
   );
@@ -191,6 +192,17 @@ function staticmap_field_formatter_view($entity_type, $entity, $field, $instance
             'height' => $size[1],
           )),
         );
+        $image = render($element[0]);
+        if ($settings['link_to_map'] == FALSE) {
+          $element[0] = array(
+            '#markup' => $image,
+          );
+        }
+        else {
+          $element[0] = array(
+            '#markup' => l($image, 'http://maps.google.com/?q=' . str_replace(' ', '', $geodata[0]), array('attributes' => array('target' => '_blank'), 'html' => TRUE)),
+          );
+        }
       }
       else {
         $element[0] = array(
@@ -306,6 +318,11 @@ function staticmap_field_formatter_settings_form($field, $instance, $view_mode,
     '#type' => 'markup',
     '#markup' => l(t('Preset Settings'), 'admin/config/content/staticmap'),
   );
+  $element['link_to_map'] = array(
+    '#title' => t('Link to Google Map'),
+    '#type' => 'checkbox',
+    '#default_value' => $settings['link_to_map'],
+  );

   return $element;
 }