diff --git a/mediafront.module b/mediafront.module
index 03f7c23..db3b86d 100755
--- a/mediafront.module
+++ b/mediafront.module
@@ -478,11 +478,14 @@ function mediafront_get_node_field_value($entity, $field) {
 
   // Otherwise, we can assume it is a field.
   if ($items = field_get_items('node', $entity, $field_name)) {
+    // Return all values in multi-value field
+    $values = array();
     foreach ($items as $item) {
       if ($value = mediafront_get_node_field_instance_value($item)) {
-        return $value;
+        $values[] = $value;
       }
     }
+    return $values;
   }
 
   return '';
@@ -522,33 +525,36 @@ function mediafront_get_node($type, $entity, $fields) {
     // Get the options.
     $options = $field['options'];
 
-    // Get the value for this field.
-    if ($value = mediafront_get_field_value($type, $entity, $field)) {
+    // Get the value(s) for this field.
+    if ($values = mediafront_get_field_value($type, $entity, $field)) {
+      $values = is_array($values) ? $values : array($values);
 
       // If this is a media field.
       if ($field['type'] == 'media') {
-        $node['mediafiles']['media'][$options['media_type']] = new MediaFile($value);
+        foreach ($values as $value) {
+          $node['mediafiles']['media'][$options['media_type']][] = new MediaFile($value);
+        }
       }
 
       // If this is an image field.
       else if ($field['type'] == 'image') {
 
         // If we just want the original image...
-        if (($options['preview'] == 'mediafront_original') || ($options['thumbnail'] == 'medifaront_original')) {
-          $file = new MediaFile($value);
+        if (($options['preview'] == 'mediafront_original') || ($options['thumbnail'] == 'mediafront_original')) {
+          $file = new MediaFile($values[0]);
           $node['mediafiles']['image']['image'] = $file;
         }
 
         // If we selected a preview style.
         if (!empty($options['preview'])) {
-          $file = new MediaFile($value);
+          $file = new MediaFile($values[0]);
           $file->path = image_style_url($options['preview'], $file->file->uri);
           $node["mediafiles"]['image']['preview'] = $file;
         }
 
         // If we selected a thumbnail style.
         if (!empty($options['thumbnail'])) {
-          $file = new MediaFile($value);
+          $file = new MediaFile($values[0]);
           $file->path = image_style_url($options['thumbnail'], $file->file->uri);
           $node["mediafiles"]['image']['thumbnail'] = $file;
         }
@@ -556,19 +562,19 @@ function mediafront_get_node($type, $entity, $fields) {
 
       // If this is the title field.
       else if ($field['type'] == 'title') {
-        $node['title'] = $value;
+        $node['title'] = $values[0];
       }
 
       // If this is a custom field.
       else if ($field['type'] == 'custom') {
 
         // Add this field to the node values.
-        $node[$options['custom']] = $value;
+        $node[$options['custom']] = $values[0];
       }
       else {
 
         // All other fields are added directly to the node.
-        $node[$field['field']] = $value;
+        $node[$field['field']] = $values[0];
       }
     }
   }
@@ -580,7 +586,7 @@ function mediafront_get_node($type, $entity, $fields) {
 
   // If we have media, but not preview, see if the media module can help us out...
   if (!empty($node['mediafiles']['media']) && empty($node['mediafiles']['image'])) {
-    if ($image = mediafront_get_media_preview($node['mediafiles']['media']['media'])) {
+    if ($image = mediafront_get_media_preview($node['mediafiles']['media']['media'][0])) {
       $node['mediafiles']['image']['image'] = $image;
     }
   }