diff --git a/sites/all/modules/contrib/geocoder/geocoder.widget.inc b/sites/all/modules/contrib/geocoder/geocoder.widget.inc
index e3719bd..10974c8 100644
--- a/sites/all/modules/contrib/geocoder/geocoder.widget.inc
+++ b/sites/all/modules/contrib/geocoder/geocoder.widget.inc
@@ -21,7 +21,7 @@ function geocoder_field_widget_info() {
  */
 function geocoder_field_widget_settings_form($this_field, $instance) {
   $settings = $instance['widget']['settings'];
-  
+
   $entity_fields = field_info_instances($instance['entity_type'], $instance['bundle']);
   $all_fields = field_info_fields();
   $supported_field_types = geocoder_supported_field_types();
@@ -30,7 +30,7 @@ function geocoder_field_widget_settings_form($this_field, $instance) {
   $field_types = array();
   $valid_fields = array();
   $available_handlers = array();
-  
+
   // Add in the title/name
   //@@TODO Do this programatically by getting entity_info
   switch ($instance['entity_type']) {
@@ -52,7 +52,7 @@ function geocoder_field_widget_settings_form($this_field, $instance) {
       $entity_fields['name']['label'] = t('Name');
       break;
   }
-  
+
   // Get a list of all valid fields that we both support and are part of this entity
   foreach ($all_fields as $field) {
     if (array_key_exists($field['field_name'], $entity_fields)) {
@@ -66,7 +66,7 @@ function geocoder_field_widget_settings_form($this_field, $instance) {
       }
     }
   }
-  
+
   $form['geocoder_field'] = array(
     '#type' => 'select',
     '#title' => t('Geocode from field'),
@@ -76,7 +76,7 @@ function geocoder_field_widget_settings_form($this_field, $instance) {
     '#required' => TRUE,
     '#attributes' => array('onchange' => 'geocoder_admin_field_selected();'),
   );
-  
+
   $form['geocoder_handler'] = array(
     '#type' => 'select',
     '#title' => t('Geocoder'),
@@ -88,11 +88,11 @@ function geocoder_field_widget_settings_form($this_field, $instance) {
     '#attributes' => array('onchange' => 'geocoder_admin_handler_selected();'),
     '#required' => TRUE,
   );
-  
+
   $form['handler_settings'] = array(
     '#tree' => TRUE,
   );
-  
+
   // Add the handler settings forms
   foreach ($processors as $handler_id => $handler) {
     if (isset($handler['settings_callback']) || isset($handler['terms_of_service'])) {
@@ -100,7 +100,7 @@ function geocoder_field_widget_settings_form($this_field, $instance) {
       $form['handler_settings'][$handler_id] = array();
       $form['handler_settings'][$handler_id]['#type'] = 'fieldset';
       $form['handler_settings'][$handler_id]['#attributes'] = array('class' => array('geocoder-handler-setting', 'geocoder-handler-setting-' . $handler_id));
-      $form['handler_settings'][$handler_id]['#title'] = $handler['title'] . ' Settings';      
+      $form['handler_settings'][$handler_id]['#title'] = $handler['title'] . ' Settings';
 
       if (isset($handler['terms_of_service'])) {
         $form['handler_settings'][$handler_id]['tos'] = array(
@@ -115,7 +115,7 @@ function geocoder_field_widget_settings_form($this_field, $instance) {
       }
     }
   }
-  
+
   $form['delta_handling'] = array(
     '#type' => 'select',
     '#title' => t('Multi-value input handling'),
@@ -130,10 +130,10 @@ function geocoder_field_widget_settings_form($this_field, $instance) {
     ),
     '#required' => TRUE,
   );
-  
+
   drupal_add_js(array('geocoder_widget_settings' => array('handlers' => $handlers_by_type, 'types' => $field_types)), 'setting');
   drupal_add_js(drupal_get_path('module', 'geocoder') . '/geocoder.admin.js', 'file');
-  
+
   return $form;
 }
 
@@ -155,12 +155,12 @@ function geocoder_field_attach_presave($entity_type, $entity) {
         $field_name = is_array($field_instance['widget']['settings']['geocoder_field']) ? reset($field_instance['widget']['settings']['geocoder_field']) : $field_instance['widget']['settings']['geocoder_field'];
         $target_info = field_info_field($field_instance['field_name']);
         $target_type = $target_info['type'];
-        
+
         // Get the handler-specific-settings
         if (isset($field_instance['widget']['settings']['handler_settings'][$handler['name']])) {
           $handler_settings = $field_instance['widget']['settings']['handler_settings'][$handler['name']];
         }
-        
+
         // Determine how we deal with deltas (multi-value fields)
         if (empty($field_instance['widget']['settings']['delta_handling'])) {
           $delta_handling = 'default';
@@ -168,12 +168,12 @@ function geocoder_field_attach_presave($entity_type, $entity) {
         else {
           $delta_handling = $field_instance['widget']['settings']['delta_handling'];
         }
-        
+
         list($field_info, $items) = geocoder_widget_get_field_data($entity_type, $entity, $field_name, $delta_handling);
-        
+
         if (is_array($items) && count($items)) {
           $values = array();
-          
+
           // Geocode geometries
           $geometries = array();
           foreach ($items as $delta => $item) {
@@ -193,7 +193,7 @@ function geocoder_field_attach_presave($entity_type, $entity) {
               drupal_set_message($e->getMessage(), 'error');
             }
           }
-          
+
           if (empty($geometries)) {
             // This field has no data, so set the field to an empty array in
             // order to delete its saved data.
@@ -215,14 +215,14 @@ function geocoder_field_attach_presave($entity_type, $entity) {
 
 /**
  * Get field items and info
- * 
+ *
  * We always pass the full field-item array (with all columns) to the handler, but there is some preprocessing
  * that we need to do for the special case of entity-labels and multi-field contactenation
  * For these two special cases we "mock-up" a text-field and pass it back for geocoding
  */
 function geocoder_widget_get_field_data($entity_type, $entity, $field_name, $delta_handling) {
   $entity_info = entity_get_info($entity_type);
-  
+
   // First check to see if it's an entity field
   if (in_array($field_name, $entity_info['entity keys'])) {
     $items[]['value'] = $entity->$field_name;
@@ -237,7 +237,7 @@ function geocoder_widget_get_field_data($entity_type, $entity, $field_name, $del
     $langcode = field_language($entity_type, $entity, $field_name);
     $items = field_get_items($entity_type, $entity, $field_name, $langcode);
   }
-  
+
   // Check if we should concatenate
   if ($delta_handling == 'c_to_s' || $delta_handling == 'c_to_m') {
     $support_concat = array('text', 'text_long', 'computed', 'text_with_summary', 'computed');
@@ -256,29 +256,29 @@ function geocoder_widget_get_field_data($entity_type, $entity, $field_name, $del
       'concated' => TRUE,
     );
   }
-  
+
   return array(
     $field_info,
-    $items, 
+    $items,
   );
 }
 
 /**
  * Geocder Widget - Resolve Deltas
- * 
- * Given a list of geometries, and user configuration on how to handle deltas, 
+ *
+ * Given a list of geometries, and user configuration on how to handle deltas,
  * we created a list of items to be inserted into the fields.
  */
 function geocoder_widget_resolve_deltas($geometries, $delta_handling = 'default', $field_type) {
   $values = array();
-  
+
   // Default delta handling: just pass one delta to the next
   if ($delta_handling == 'default') {
     foreach ($geometries as $geometry) {
       $values[] = geocoder_widget_values_from_geometry($geometry, $field_type);
     }
   }
-  
+
   // Single-to-multiple handling - if we can, explode out the component geometries
   if ($delta_handling == 's_to_m' || $delta_handling = 'c_to_m') {
     $type = $geometries[0]->geometryType();
@@ -292,21 +292,21 @@ function geocoder_widget_resolve_deltas($geometries, $delta_handling = 'default'
       $values[] = geocoder_widget_values_from_geometry($geometries[0], $field_type);
     }
   }
-  
+
   // For multiple-to-single handling, run it though geometryReduce
    if ($delta_handling == 'm_to_s' || $delta_handling = 'c_to_s') {
     $reduced_geom = geoPHP::geometryReduce($geometries);
     $values[] = geocoder_widget_values_from_geometry($reduced_geom, $field_type);
   }
-  
+
   return $values;
 }
 
 /**
  * Geocder Widget - Field values from geometry
- * 
+ *
  * Given a geometry and the field type, return back a values array for that field.
- * The passed back array represents a single delta. 
+ * The passed back array represents a single delta.
  */
 function geocoder_widget_values_from_geometry($geometry, $field_type) {
   if ($field_type == 'geofield') return geofield_get_values_from_geometry($geometry);
@@ -314,7 +314,7 @@ function geocoder_widget_values_from_geometry($geometry, $field_type) {
     $centroid = $geometry->centroid();
     $lat = $centroid->y();
     $lng = $centroid->x();
-    
+
     return array(
       'lat' => $lat,
       'lng' => $lng,
@@ -344,10 +344,22 @@ function geocoder_widget_parse_addressfield($field_item) {
   if (!empty($field_item['locality']))                $address .= $field_item['locality'] . ',';
   if (!empty($field_item['administrative_area']))     $address .= $field_item['administrative_area'] . ',';
   if (!empty($field_item['sub_administrative_area'])) $address .= $field_item['sub_administrative_area'] . ',';
-  if (!empty($field_item['country']))                 $address .= $field_item['country'] . ',';
-  
+
+  if (!empty($field_item['country']))  {
+    // If the country module exsists we can lookup the friendly name.
+    if (module_exists('countries')) {
+      $country_info = country_load($field_item['country']);
+      if (is_object($country_info) && $country_info->name != '') {
+        $address .= $country_info->name . ',';
+      }
+    }
+    else {
+      $address .= 'country: ' . $field_item['country'];
+    }
+  }
+
   $address = rtrim($address, ', ');
-  
+
   return $address;
 }
 
@@ -365,7 +377,7 @@ function geocoder_widget_parse_locationfield($field_item) {
     $address .=  $province_fullname . ',';
   }
   if (!empty($field_item['country']))     $address .= $field_item['country'] . ',';
-  
+
   $address = rtrim($address, ', ');
 
   return $address;