diff --git a/term_fields.module b/term_fields.module
index 4118ea0..db4586e 100644
--- a/term_fields.module
+++ b/term_fields.module
@@ -827,7 +827,7 @@ function term_fields_ctools_plugin_api($owner, $api) {
 function term_fields_feeds_plugins() {
   $path = drupal_get_path('module', 'term_fields') . '/feeds';
   $info = array();
-  
+
   $info['TermFieldsTermProcessor'] = array(
     'name' => 'Taxonomy term processor (with term fields)',
     'description' => 'Create taxonomy terms from parsed content. This is a extended Taxonomy term processor.',
@@ -839,7 +839,7 @@ function term_fields_feeds_plugins() {
       'path' => $path,
     ),
   );
-  
+
   return $info;
 }
 
@@ -892,3 +892,53 @@ function term_fields_feeds_taxonomy_load($term) {
 /**
  * @}
  */
+
+/**
+ * Implementation of hook_ctools_context_convert_list_alter().
+ */
+function term_fields_ctools_context_convert_list_alter(&$plugin, &$converters) {
+  if(!empty($plugin['context name']) && $plugin['context name'] == 'terms') {
+    $term_fields = array();
+    $fields = term_fields_get_rows();
+    foreach ($fields as $fid => $field) {
+      if ($field->type != 'textarea' && $field->type != 'date') {
+        $term_fields['field-' . $fid] = t('@description', array('@description' => $field->description));
+        $term_fields['field-' . $fid . '-raw'] = t('@description - *RAW*', array('@description' => $field->description));
+      }
+    }
+
+    // Add $term_fields to substitutions.
+    // If $converters is commented out, user can still call them with
+    // Note that term_fields may be used as keywords using patterns like
+    // <em>%term:field_name-formatted</em>.'
+    $converters = $converters + $term_fields;
+    return $converters;
+  }
+}
+
+/**
+ * Implementation of hook_ctools_context_converter_alter().
+ */
+function term_fields_ctools_context_converter_alter(&$context, $converter, &$value) {
+  if (substr($converter, 0, 6) === 'field-' && !empty($context->data->vid)) {
+    $fids = term_fields_get_fids($context->data->vid);
+    // strips field- from converter.
+    $field = substr($converter, 6);
+    // check to see if $converter is the -raw version.
+    // If so, no need to check_plain the $value
+    if (substr($converter, -4) === '-raw') {
+      $raw = TRUE;
+      $field = (substr($field, 0, -4));
+    }
+    // If the specific fid is in the field array set the value of the substitution
+    if (in_array($field, $fids)) {
+      $value = term_fields_get_field($context->data->tid, $field);
+      // If the substitution value is not raw check_plain the value.
+      if (!$raw) {
+        $value = check_plain($value);
+      }
+      return $value;
+    }
+  }
+}
+