diff --git a/WebformViewsSelectStyle.inc b/WebformViewsSelectStyle.inc
index 88c12af..27bb3c3 100644
--- a/WebformViewsSelectStyle.inc
+++ b/WebformViewsSelectStyle.inc
@@ -8,6 +8,7 @@
 /**
  * The style plugin for Webform Views Select.
  */
+
 class WebformViewsSelectStyle extends views_plugin_style_mapping {
 
   /**
@@ -26,6 +27,26 @@ class WebformViewsSelectStyle extends views_plugin_style_mapping {
     );
   }
 
+  public function option_definition() {
+    $options = parent::option_definition();
+    $options['strip_html'] = array(
+      'default' => TRUE,
+      'bool' => TRUE,
+    );
+
+    return $options;
+  }
+
+  public function options_form(&$form, &$form_state) {
+    parent::options_form($form, $form_state);
+
+    $form['strip_html'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Strip HTML'),
+      '#default_value' => $this->options['strip_html'],
+    );
+  }
+
   /**
    * Implements views_plugin_style::validate().
    */
diff --git a/webform_views_select.module b/webform_views_select.module
index bc86fd7..3f68203 100644
--- a/webform_views_select.module
+++ b/webform_views_select.module
@@ -56,10 +56,15 @@ function webform_views_select_options($component, $flat, $filter, $args = array(
     $args = $filter;
   }
 
-  // Get the view and execute it.
+  // Get the view and display.
   $view = views_get_view($args['view']);
   $view->set_display($args['display_id']);
 
+  // If views args are present, add them
+  if(isset($args['view_args'])) {
+    $view->set_arguments($args['view_args']);
+  }
+
   return webform_views_select_options_from_view($view);
 }
 
@@ -95,7 +100,14 @@ function webform_views_select_options_from_view($view) {
     // We strip HTML tags from the field output because some fields (e.g. Date
     // fields) include tags in their output.
     $rendered_key = htmlspecialchars_decode(strip_tags($result[$key]), ENT_QUOTES);
-    $rendered_value = htmlspecialchars_decode(strip_tags($result[$value]), ENT_QUOTES);
+
+    // Checks if Strip HTML is checked or not
+    if ($view->display_handler->get_option('style_plugin') == 'webform_views_select_style' && $view->style_plugin->options['strip_html'] == 0) {
+      $rendered_value = $result[$value];
+    } else {
+      $rendered_value = htmlspecialchars_decode(strip_tags($result[$value]), ENT_QUOTES);
+    }
+
     $rows[$rendered_key] = $rendered_value;
   }