diff --git a/README.txt b/README.txt
old mode 100644
new mode 100755
diff --git a/css/display-options-background.png b/css/display-options-background.png
old mode 100644
new mode 100755
diff --git a/css/menu-block.admin.css b/css/menu-block.admin.css
old mode 100644
new mode 100755
diff --git a/js/menu-block.js b/js/menu-block.js
old mode 100644
new mode 100755
diff --git a/menu-block-wrapper.tpl.php b/menu-block-wrapper.tpl.php
old mode 100644
new mode 100755
index d98bca3..6dc11ea
--- a/menu-block-wrapper.tpl.php
+++ b/menu-block-wrapper.tpl.php
@@ -12,8 +12,8 @@
  * The following variables are provided for contextual information.
  * - $delta: (string) The menu_block's block delta.
  * - $config: An array of the block's configuration settings. Includes
- *   menu_name, parent_mlid, title_link, admin_title, level, follow, depth,
- *   expanded, and sort.
+ *   menu_name, parent_mlid, title_link, admin_title, class_name, level, follow,
+ *   depth, expanded, and sort.
  *
  * @see template_preprocess_menu_block_wrapper()
  */
diff --git a/menu_block.admin.inc b/menu_block.admin.inc
old mode 100644
new mode 100755
index 0490262..db37a08
--- a/menu_block.admin.inc
+++ b/menu_block.admin.inc
@@ -222,6 +222,13 @@ function _menu_block_block_configure($delta = '') {
  */
 function menu_block_configure_form($form, &$form_state) {
   $config = array();
+  // Set default delta if delta is not set.
+  if(isset($form_state['values']['delta'])) {
+    $delta = $form_state['values']['delta'];
+  }
+  else {
+    $delta = '[block-delta]';
+  }
   // Get the config from the form state.
   if (!empty($form_state['values'])) {
     $config = $form_state['values'];
@@ -300,6 +307,12 @@ function menu_block_configure_form($form, &$form_state) {
     '#description' => t('The preferred menus used by <em>&lt;the menu selected by the page&gt;</em> can be customized on the <a href="!url">Menu block settings page</a>.', array('!url' => url('admin/config/user-interface/menu-block'))),
     '#attributes' => array('class' => array('menu-block-menu-name')),
   );
+  $form['class_name'] = array(
+    '#type' => 'textfield',
+    '#default_value' => $config['class_name'],
+    '#title' => t('Additional CSS class name'),
+    '#description' => t('Optionally assign a CSS class name in addition to <strong>menu-block-!delta</strong>.', array('!delta' => $delta)),
+  );
   $form['level'] = array(
     '#type' => 'select',
     '#title' => t('Starting level'),
@@ -401,7 +414,15 @@ function menu_block_configure_form($form, &$form_state) {
   $form['menu-block-wrapper-close'] = array('#markup' => '</div>');
 
   // Set visibility of advanced options.
-  foreach (array('title_link', 'display_empty', 'follow', 'depth_relative', 'follow_parent', 'expanded', 'sort', 'parent') as $key) {
+  foreach (array(
+    'title_link',
+    'follow',
+    'follow_parent',
+    'class_name',
+    'expanded',
+    'sort',
+    'parent',
+  ) as $key) {
     $form[$key]['#states']['visible'][':input[name=display_options]'] = array('value' => 'advanced');
   }
   // depth_relative and follow_parent aren't listed below because they require
@@ -448,6 +469,7 @@ function _menu_block_block_save($delta = '', $edit = array()) {
     if (empty($config['exported_to_code'])) {
       variable_set("menu_block_{$delta}_title_link", $edit['title_link']);
       variable_set("menu_block_{$delta}_admin_title", $edit['admin_title']);
+      variable_set("menu_block_{$delta}_class_name", $edit['class_name']);
       variable_set("menu_block_{$delta}_parent", $edit['parent']);
       variable_set("menu_block_{$delta}_level", $edit['level']);
       variable_set("menu_block_{$delta}_follow", $edit['follow']);
diff --git a/menu_block.api.php b/menu_block.api.php
old mode 100644
new mode 100755
index 491297e..a8b5b65
--- a/menu_block.api.php
+++ b/menu_block.api.php
@@ -37,6 +37,7 @@ function hook_menu_block_blocks() {
       'parent_mlid' => 0,
       'title_link'  => FALSE,
       'admin_title' => 'Drop-down navigation',
+      'class_name'  => 'primary-links-menu-block',
       'level'       => 1,
       'follow'      => 0,
       'depth'       => 2,
diff --git a/menu_block.follow.inc b/menu_block.follow.inc
old mode 100644
new mode 100755
diff --git a/menu_block.info b/menu_block.info
old mode 100644
new mode 100755
diff --git a/menu_block.install b/menu_block.install
old mode 100644
new mode 100755
diff --git a/menu_block.module b/menu_block.module
old mode 100644
new mode 100755
index 22f1b27..91e3394
--- a/menu_block.module
+++ b/menu_block.module
@@ -191,6 +191,10 @@ function template_preprocess_menu_block_wrapper(&$variables) {
   $variables['classes_array'][] = 'menu-name-' . $variables['config']['menu_name'];
   $variables['classes_array'][] = 'parent-mlid-' . menu_block_clean_css_identifier($variables['config']['parent_mlid']);
   $variables['classes_array'][] = 'menu-level-' . $variables['config']['level'];
+  $classes = explode(' ', $variables['config']['class_name']);
+  foreach ($classes as $class) {
+    $variables['classes_array'][] = drupal_html_class($class);
+  }
 }
 
 /**
@@ -239,6 +243,7 @@ function menu_block_default_config() {
     'parent' => 'main-menu:0',
     'title_link' => 0,
     'admin_title' => '',
+    'class_name' => '',
     'level' => 1,
     'follow' => 0,
     'display_empty' => 0,
@@ -488,6 +493,7 @@ function menu_block_get_current_page_menu() {
  *     or a simple string.
  *   - admin_title: (string) An optional title to uniquely identify the block on
  *     the administer blocks page.
+ *   - class_name: (string) An additional CSS class to give to the menu block.
  *   - level: (int) The starting level of the tree.
  *   - follow: (string) Specifies if the starting level should follow the
  *     active menu item. Should be set to 0, 'active' or 'child'.
diff --git a/menu_block.pages.inc b/menu_block.pages.inc
old mode 100644
new mode 100755
diff --git a/menu_block.sort.inc b/menu_block.sort.inc
old mode 100644
new mode 100755
diff --git a/menu_block_export.admin.inc b/menu_block_export.admin.inc
old mode 100644
new mode 100755
index 8e487b8..f0a1745
--- a/menu_block_export.admin.inc
+++ b/menu_block_export.admin.inc
@@ -78,6 +78,7 @@ function menu_block_export_form_submit(&$form, &$form_state) {
       'parent'      => {$config['parent']},
       'title_link'  => {$config['title_link']},
       'admin_title' => '{$config['admin_title']}',
+      'class_name' => '{$config['class_name']}',
       'level'       => {$config['level']},
       'follow'      => '{$config['follow']}',
       'depth'       => {$config['depth']},
diff --git a/menu_block_export.info b/menu_block_export.info
old mode 100644
new mode 100755
diff --git a/menu_block_export.module b/menu_block_export.module
old mode 100644
new mode 100755
diff --git a/plugins/content_types/menu_tree/icon_contrib_booknavigation.png b/plugins/content_types/menu_tree/icon_contrib_booknavigation.png
old mode 100644
new mode 100755
diff --git a/plugins/content_types/menu_tree/icon_contrib_main_menu.png b/plugins/content_types/menu_tree/icon_contrib_main_menu.png
old mode 100644
new mode 100755
diff --git a/plugins/content_types/menu_tree/icon_contrib_management.png b/plugins/content_types/menu_tree/icon_contrib_management.png
old mode 100644
new mode 100755
diff --git a/plugins/content_types/menu_tree/icon_contrib_menu.png b/plugins/content_types/menu_tree/icon_contrib_menu.png
old mode 100644
new mode 100755
diff --git a/plugins/content_types/menu_tree/menu_tree.inc b/plugins/content_types/menu_tree/menu_tree.inc
old mode 100644
new mode 100755