--- taxonomy_image\taxonomy_image.module	2007-01-18 00:00:24.000000000 -0500
+++ taxonomy_image.module	2007-11-10 10:11:38.255000000 -0500
@@ -96,7 +96,11 @@ function taxonomy_image_display($tid, $t
         }
       }
       $current = $image[$tid];
-      return "<img src='$current->url' width='$current->width' height='$current->height' alt='$current->name' $tags />";
+      $return_url = "<img src='$current->url' width='$current->width' height='$current->height' alt='$current->name' $tags />";
+      if (variable_get('taxonomy_image_wrapper', FALSE)) {
+        $return_url = '<div class="taxonomy_image_wrapper">'. $return_url .'</div>';
+      }
+      return $return_url;
     }
   }
   return '';
@@ -212,6 +216,14 @@ function taxonomy_image_admin_settings()
     '#options' => array(3 => 'Exact', 2 => 'Not less than', 1 => 'Not greater than', 0 => 'Disabled'),
     '#description' => t('This option allows you to control the size of pictures displayed by this module.  If set to \'disabled\', pictures will not be resized, displayed exactly as they are uploaded.  If set to \'not greater than\', pictures larger than the specified size will be scaled down.  If set to \'not less than\', pictures smaller than the specified size will be scaled up.  If set to \'exact\', pictures will be resized to exactly the specified dimension(s).'),
   );
+
+  $form['pictures']['taxonomy_image_wrapper'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Add wrapper div tag'),
+    '#default_value' => variable_get('taxonomy_image_wrapper', FALSE),
+    '#description' => t("This option indicates whether to add a '&lt;div&gt;' tag to the image. This may be useful in lists where the images are not of the same width."),
+  );
+
   $form['pictures']['taxonomy_image_height'] = array(
     '#type' => 'textfield',
     '#title' => t('Picture height'),