diff --git a/field_collection_views.module b/field_collection_views.module
index 77c394e..e70b3f0 100644
--- a/field_collection_views.module
+++ b/field_collection_views.module
@@ -17,6 +17,7 @@ function field_collection_views_field_formatter_info() {
       'settings' =>  array(
         'name' => 'field_collection_view',
         'display_id' => 'default',
+        'pass_arguments' => TRUE,
         'add' => t('Add'),
       ),
     ),
@@ -32,21 +33,16 @@ function field_collection_views_field_formatter_view($entity_type, $entity, $fie
 
   switch ($display['type']) {
     case 'field_collection_views_view':
-      //debug($items);
-      $args = '';
-      $i = 1;
-      foreach ($items as $delta => $item) {
-        if($i == 1) {
-          $args .= $item['value'];
+      $args = array();
+      if ($settings['pass_arguments']) {
+        foreach ($items as $delta => $item) {
+          $args[] = $item['value'];
         }
-        else {
-          $args .= '+' . $item['value'];
-        }
-        $i++;
       }
       $view_name = isset($settings['name']) ? $settings['name'] : 'field_collection_view';
       $display_id = isset($settings['display_id']) ? $settings['display_id'] : 'default';
-      $content = views_embed_view($view_name, $display_id, $args);
+      $arguments = ($settings['pass_arguments'] && count($args)) ? implode('+', $args) : NULL;
+      $content = views_embed_view($view_name, $display_id, $arguments);
       $element[0] = array(
         '#markup' => $content,
       );
@@ -84,6 +80,12 @@ function field_collection_views_field_formatter_settings_form($field, $instance,
     '#default_value' => $settings['add'],
     '#description' => t('Leave the title empty, to hide the link.'),
   );
+  $elements['pass_arguments'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Pass entity ids as arguments.'),
+    '#default_value' => $settings['pass_arguments'],
+    '#description' => t('When checked, all entity ids are passed as arguments to the view. Leave empty to use your own default arguments.'),
+  );
 
   return $elements;
 }
@@ -96,13 +98,11 @@ function field_collection_views_field_formatter_settings_summary($field, $instan
   $settings = $display['settings'];
 
   $links = array_filter(array_intersect_key($settings, array_flip(array('name', 'display_id'))));
-  if ($links) {
-    return '<em>Embed View:</em> ' . check_plain(implode(', ', $links));
-  }
-  else {
-    return t('Not showing any view.');
-  }
+  $summary = array();
+  $summary[] = ($links) ? t('Embed View: %view', array('%view' => check_plain(implode(', ', $links)))) : t('Not showing any view.');
+  $summary[] = ($settings['pass_arguments']) ? t('Passing entity ids as arguments') : t('Not passing arguments');
 
+  return theme('item_list', array('items' => $summary));
 }
 
 /**