diff --git a/includes/views_slideshow_imageflow.variables.inc b/includes/views_slideshow_imageflow.variables.inc
old mode 100644
new mode 100755
index 242af52..6a89afe
--- a/includes/views_slideshow_imageflow.variables.inc
+++ b/includes/views_slideshow_imageflow.variables.inc
@@ -114,8 +114,10 @@ function views_slideshow_imageflow_variable_default($name = NULL) {
       'captions' => TRUE,
       'imageFocusM' => '1.0',
       'scrollbarP' => '0.6',
+      'buttons' => FALSE,
       'imageFocusMax' => '4',
       'onClick' => 'function() { document.location = this.url; }',
+      'circular' => FALSE,
     );
   }
 
diff --git a/themes/js/views_slideshow_imageflow.js b/themes/js/views_slideshow_imageflow.js
old mode 100644
new mode 100755
index c564525..fda56d1
--- a/themes/js/views_slideshow_imageflow.js
+++ b/themes/js/views_slideshow_imageflow.js
@@ -19,10 +19,15 @@
       if (!flow['captions']) {
         flow['captions'] = false;
       }
+      if(flow['circular']) {
+        // can't have an imageFocusMax if you want circular
+        flow['imageFocusMax'] = undefined;
+      }
 
       var _settings = {
         ImageFlowID: id,
         reflections: false,
+        buttons: flow['buttons'],
         imagesHeight: flow['imagesHeight'],
         aspectRatio: flow['aspectRatio'],
         imageCursor: flow['imageCursor'],
@@ -30,9 +35,10 @@
         slider: flow['slider'],
         sliderCursor: flow['sliderCursor'],
         captions: flow['captions'],
-        imageFocusM : flow['imageFocusM'],
-        scrollbarP : flow['scrollbarP'],
-        imageFocusMax : flow['imageFocusMax']
+        imageFocusM: flow['imageFocusM'],
+        scrollbarP: flow['scrollbarP'],
+        imageFocusMax: flow['imageFocusMax'],
+        circular: flow['circular']
       };
 
       if (flow['onClick']) {
diff --git a/themes/views_slideshow_imageflow.theme.inc b/themes/views_slideshow_imageflow.theme.inc
old mode 100644
new mode 100755
index 3df03c9..180e9e4
--- a/themes/views_slideshow_imageflow.theme.inc
+++ b/themes/views_slideshow_imageflow.theme.inc
@@ -77,6 +77,8 @@ function template_preprocess_views_slideshow_imageflow(&$vars) {
   $options['views_slideshow_imageflow']['imageFocusM'] = isset($options['views_slideshow_imageflow']['imageFocusM']) ? $options['views_slideshow_imageflow']['imageFocusM'] : 1.0;
   $options['views_slideshow_imageflow']['scrollbarP'] = isset($options['views_slideshow_imageflow']['scrollbarP']) ? $options['views_slideshow_imageflow']['scrollbarP'] : 0.6;
   $options['views_slideshow_imageflow']['imageFocusMax'] = isset($options['views_slideshow_imageflow']['imageFocusMax']) ? $options['views_slideshow_imageflow']['imageFocusMax'] : 4;
+  $options['views_slideshow_imageflow']['buttons'] = isset($options['views_slideshow_imageflow']['buttons']) ? $options['views_slideshow_imageflow']['captions'] : FALSE;
+  $options['views_slideshow_imageflow']['circular'] = isset($options['views_slideshow_imageflow']['circular']) ? $options['views_slideshow_imageflow']['captions'] : FALSE;
   $settings = array(
     'aspectRatio' => $options['views_slideshow_imageflow']['aspect_ratio'],
     'imagesHeight' => $options['views_slideshow_imageflow']['images_height'],
@@ -87,8 +89,10 @@ function template_preprocess_views_slideshow_imageflow(&$vars) {
     'captions' => $options['views_slideshow_imageflow']['captions'],
     'imageFocusM' => $options['views_slideshow_imageflow']['imageFocusM'],
     'scrollbarP' => $options['views_slideshow_imageflow']['scrollbarP'],
+    'buttons' => $options['views_slideshow_imageflow']['buttons'],
     'imageFocusMax' => $options['views_slideshow_imageflow']['imageFocusMax'],
     'onClick' => $options['views_slideshow_imageflow']['onClick'],
+    'circular' => $options['views_slideshow_imageflow']['circular'],
   );
   drupal_add_js(array('viewsSlideshowImageFlow' => array('views-slideshow-imageflow-images-'. $vars['id'] => $settings)), 'setting');
 }
diff --git a/views_slideshow_imageflow.module b/views_slideshow_imageflow.module
old mode 100644
new mode 100755
diff --git a/views_slideshow_imageflow.views_slideshow.inc b/views_slideshow_imageflow.views_slideshow.inc
old mode 100644
new mode 100755
index a719aac..d5009b0
--- a/views_slideshow_imageflow.views_slideshow.inc
+++ b/views_slideshow_imageflow.views_slideshow.inc
@@ -32,8 +32,10 @@ function views_slideshow_imageflow_views_slideshow_option_definition() {
       'captions' => views_slideshow_imageflow_variable_get('captions'),
       'imageFocusM' => views_slideshow_imageflow_variable_get('imageFocusM'),
       'scrollbarP' => views_slideshow_imageflow_variable_get('scrollbarP'),
+      'buttons' => views_slideshow_imageflow_variable_get('buttons'),
       'imageFocusMax' => views_slideshow_imageflow_variable_get('imageFocusMax'),
       'onClick' => views_slideshow_imageflow_variable_get('onClick'),
+      'circular' => views_slideshow_imageflow_variable_get('circular'),
     ),
   );
   return $options;
@@ -120,6 +122,12 @@ function views_slideshow_imageflow_views_slideshow_options_form(&$form, &$form_s
     '#description' => t('Multiplier width of the scrollbar (0-1).'),
     '#default_value' => $view->options['views_slideshow_imageflow']['scrollbarP'],
   );
+  $form['views_slideshow_imageflow']['buttons'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Buttons'),
+    '#description' => t('Enables scrollbar previous and next buttons'),
+    '#default_value' => $view->options['views_slideshow_imageflow']['buttons'],
+  );
   $form['views_slideshow_imageflow']['imageFocusMax'] = array(
     '#type' => 'textfield',
     '#title' => t('Image focus max'),
@@ -133,4 +141,10 @@ function views_slideshow_imageflow_views_slideshow_options_form(&$form, &$form_s
     '#description' => t('You may override the onClick JavaScript function of slide show image frames here.'),
     '#default_value' => $view->options['views_slideshow_imageflow']['onClick'],
   );
+  $form['views_slideshow_imageflow']['circular'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Circular'),
+    '#description' => t('Enables circular mode (ignores image focus multiplier)'),
+    '#default_value' => $view->options['views_slideshow_imageflow']['circular'],
+  );
 }