diff --git a/flexslider/flexslider_views/flexslider_views_plugin_style_flexslider.inc b/flexslider/flexslider_views/flexslider_views_plugin_style_flexslider.inc
index 0b2c1d2..0273e57 100755
--- a/flexslider/flexslider_views/flexslider_views_plugin_style_flexslider.inc
+++ b/flexslider/flexslider_views/flexslider_views_plugin_style_flexslider.inc
@@ -61,11 +61,18 @@ class flexslider_views_plugin_style_flexslider extends views_plugin_style {
    */
   function find_image_field() {
     foreach ($this->view->display_handler->get_handlers('field') as $id => $handler) {
+     
       if (($handler instanceof views_handler_field_field) && ($handler->field_info['type'] == 'image')) {
         return $id;
         break;
       }
+      // Media Support
+      if (($handler instanceof views_handler_field_field) && ($handler->field_info['type'] == 'media')) {
+        return $id;
+        break;
+      }
     }
+    
     return FALSE;
   }
 
@@ -74,6 +81,7 @@ class flexslider_views_plugin_style_flexslider extends views_plugin_style {
    */
   function render() {
     $image_field = $this->find_image_field();
+      
     if ($image_field === FALSE) {
       drupal_set_message(t('Style @style requires an image field to be added.', array('@style' => $this->definition['title'])), 'error');
       return;
@@ -94,6 +102,7 @@ class flexslider_views_plugin_style_flexslider extends views_plugin_style {
           'title' => $title)
         );
     }
+        
     return $output;
   }
 }
diff --git a/flexslider/flexslider_views/theme/flexslider_views.theme.inc b/flexslider/flexslider_views/theme/flexslider_views.theme.inc
index 2623fc4..bf3652d 100644
--- a/flexslider/flexslider_views/theme/flexslider_views.theme.inc
+++ b/flexslider/flexslider_views/theme/flexslider_views.theme.inc
@@ -26,6 +26,19 @@ function theme_views_view_flexslider($vars) {
     // Fields in core don't inherit their containing language by default.
     // Assume LANGUAGE_NONE until a better solution comes along
     $item = $row->_field_data[$view->base_field]['entity']->{$img_field_name}[LANGUAGE_NONE][0];
+    
+    // Add Media Support
+    if(isset($item['fid']) && !isset($item['uri'])) {
+      $item = (Array)file_load($item['fid']);
+      
+      // Alt and title support
+      if(!isset($item['alt'])) { $item['alt'] = $item['origname']; }
+      
+      // Alt and title support
+      if(!isset($item['title'])) { $item['title'] = $item['origname']; }
+
+    }
+    
     $items[] = $item;
   }