diff --git a/Modules/Segmentation/Interactions/mitkOtsuTool3D.cpp b/Modules/Segmentation/Interactions/mitkOtsuTool3D.cpp
index 6efc9fbc45..159809a007 100644
--- a/Modules/Segmentation/Interactions/mitkOtsuTool3D.cpp
+++ b/Modules/Segmentation/Interactions/mitkOtsuTool3D.cpp
@@ -1,229 +1,289 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 // MITK
 #include "mitkOtsuTool3D.h"
 #include "mitkToolManager.h"
 #include "mitkRenderingManager.h"
 #include <mitkSliceNavigationController.h>
 #include <mitkImageCast.h>
 #include <mitkITKImageImport.h>
 #include <mitkRenderingModeProperty.h>
 #include <mitkLevelWindowProperty.h>
 #include <mitkLookupTableProperty.h>
 #include "mitkOtsuSegmentationFilter.h"
 
 // ITK
 #include <itkOtsuMultipleThresholdsImageFilter.h>
 #include <itkBinaryThresholdImageFilter.h>
+#include <itkOrImageFilter.h>
 
 #include "mitkRegionGrow3DTool.xpm"
 
 // us
 #include <usModule.h>
 #include <usModuleResource.h>
 #include <usGetModuleContext.h>
 #include <usModuleContext.h>
 
 namespace mitk {
   MITK_TOOL_MACRO(MitkSegmentation_EXPORT, OtsuTool3D, "Otsu Segmentation");
 }
 
 mitk::OtsuTool3D::OtsuTool3D()
 {
 }
 
 mitk::OtsuTool3D::~OtsuTool3D()
 {
 
 }
 
 void mitk::OtsuTool3D::Activated()
 {
   if (m_ToolManager)
   {
     m_OriginalImage = dynamic_cast<mitk::Image*>(m_ToolManager->GetReferenceData(0)->GetData());
 
     m_BinaryPreviewNode = mitk::DataNode::New();
     m_BinaryPreviewNode->SetName("Binary_Preview");
     m_BinaryPreviewNode->SetProperty( "color", ColorProperty::New(0.0, 1.0, 0.0) );
     m_BinaryPreviewNode->SetProperty( "opacity", FloatProperty::New(0.3) );
     //m_BinaryPreviewNode->SetBoolProperty("helper object", true);
     //m_BinaryPreviewNode->SetProperty("binary", mitk::BoolProperty::New(true));
     m_ToolManager->GetDataStorage()->Add( this->m_BinaryPreviewNode );
 
     m_MultiLabelResultNode = mitk::DataNode::New();
     m_MultiLabelResultNode->SetName("Otsu_Preview");
     //m_MultiLabelResultNode->SetBoolProperty("helper object", true);
     m_MultiLabelResultNode->SetVisibility(true);
 
     m_MaskedImagePreviewNode = mitk::DataNode::New();
     m_MaskedImagePreviewNode->SetName("Volume_Preview");
     //m_MultiLabelResultNode->SetBoolProperty("helper object", true);
     m_MaskedImagePreviewNode->SetVisibility(false);
 
     m_ToolManager->GetDataStorage()->Add( this->m_MultiLabelResultNode );
   }
 }
 
 void mitk::OtsuTool3D::Deactivated()
 {
   m_ToolManager->GetDataStorage()->Remove( this->m_MultiLabelResultNode );
   m_MultiLabelResultNode = NULL;
   m_ToolManager->GetDataStorage()->Remove( this->m_BinaryPreviewNode );
   m_BinaryPreviewNode = NULL;
   m_ToolManager->GetDataStorage()->Remove( this->m_MaskedImagePreviewNode);
   m_MaskedImagePreviewNode = NULL;
 }
 
 const char** mitk::OtsuTool3D::GetXPM() const
 {
   return NULL;
 }
 
 us::ModuleResource mitk::OtsuTool3D::GetIconResource() const
 {
   us::Module* module = us::GetModuleContext()->GetModule();
   us::ModuleResource resource = module->GetResource("Otsu_48x48.png");
   return resource;
 }
 
 void mitk::OtsuTool3D::RunSegmentation(int regions, bool useValley, int numberOfBins)
 {
   //this->m_OtsuSegmentationDialog->setCursor(Qt::WaitCursor);
 
   int numberOfThresholds = regions - 1;
 
   unsigned int timestep = mitk::RenderingManager::GetInstance()->GetTimeNavigationController()->GetTime()->GetPos();
 
   mitk::Image::Pointer image3D = Get3DImage(m_OriginalImage, timestep);
 
   mitk::OtsuSegmentationFilter::Pointer otsuFilter = mitk::OtsuSegmentationFilter::New();
   otsuFilter->SetNumberOfThresholds( numberOfThresholds );
   otsuFilter->SetValleyEmphasis( useValley );
   otsuFilter->SetNumberOfBins( numberOfBins );
   otsuFilter->SetInput( image3D );
 
   try
   {
     otsuFilter->Update();
   }
   catch( ... )
   {
     mitkThrow() << "itkOtsuFilter error (image dimension must be in {2, 3} and image must not be RGB)";
   }
 
   m_ToolManager->GetDataStorage()->Remove( this->m_MultiLabelResultNode );
   m_MultiLabelResultNode = NULL;
   m_MultiLabelResultNode = mitk::DataNode::New();
   m_MultiLabelResultNode->SetName("Otsu_Preview");
   m_MultiLabelResultNode->SetVisibility(true);
   m_ToolManager->GetDataStorage()->Add( this->m_MultiLabelResultNode );
   m_MultiLabelResultNode->SetOpacity(1.0);
 
   this->m_MultiLabelResultNode->SetData( otsuFilter->GetOutput() );
   m_MultiLabelResultNode->SetProperty("binary", mitk::BoolProperty::New(false));
   mitk::RenderingModeProperty::Pointer renderingMode = mitk::RenderingModeProperty::New();
   renderingMode->SetValue( mitk::RenderingModeProperty::LOOKUPTABLE_LEVELWINDOW_COLOR );
   m_MultiLabelResultNode->SetProperty("Image Rendering.Mode", renderingMode);
   mitk::LookupTable::Pointer lut = mitk::LookupTable::New();
   mitk::LookupTableProperty::Pointer prop = mitk::LookupTableProperty::New(lut);
   vtkSmartPointer<vtkLookupTable> lookupTable = vtkSmartPointer<vtkLookupTable>::New();
   lookupTable->SetHueRange(1.0, 0.0);
   lookupTable->SetSaturationRange(1.0, 1.0);
   lookupTable->SetValueRange(1.0, 1.0);
   lookupTable->SetTableRange(-1.0, 1.0);
   lookupTable->Build();
   lut->SetVtkLookupTable(lookupTable);
   prop->SetLookupTable(lut);
   m_MultiLabelResultNode->SetProperty("LookupTable",prop);
   mitk::LevelWindowProperty::Pointer levWinProp = mitk::LevelWindowProperty::New();
   mitk::LevelWindow levelwindow;
   levelwindow.SetRangeMinMax(0, numberOfThresholds + 1);
   levWinProp->SetLevelWindow( levelwindow );
   m_MultiLabelResultNode->SetProperty( "levelwindow", levWinProp );
 
   //m_BinaryPreviewNode->SetVisibility(false);
 //  m_MultiLabelResultNode->SetVisibility(true);
   //this->m_OtsuSegmentationDialog->setCursor(Qt::ArrowCursor);
   mitk::RenderingManager::GetInstance()->RequestUpdateAll();
 }
 
 void mitk::OtsuTool3D::ConfirmSegmentation()
 {
   GetTargetSegmentationNode()->SetData(dynamic_cast<mitk::Image*>(m_BinaryPreviewNode->GetData()));
   m_ToolManager->ActivateTool(-1);
 }
 
-void mitk::OtsuTool3D::UpdateBinaryPreview(int regionID)
+void mitk::OtsuTool3D::UpdateBinaryPreview(std::vector<int> regionIDs)
 {
   m_MultiLabelResultNode->SetVisibility(false);
   //pixel with regionID -> binary image
   const unsigned short dim = 3;
   typedef unsigned char PixelType;
 
   typedef itk::Image< PixelType, dim > InputImageType;
   typedef itk::Image< PixelType, dim > OutputImageType;
 
   typedef itk::BinaryThresholdImageFilter< InputImageType, OutputImageType > FilterType;
 
   FilterType::Pointer filter = FilterType::New();
 
   InputImageType::Pointer itkImage;
+  OutputImageType::Pointer itkBinaryTempImage1;
+  OutputImageType::Pointer itkBinaryTempImage2;
+  OutputImageType::Pointer itkBinaryResultImage;
 
   mitk::Image::Pointer multiLabelSegmentation = dynamic_cast<mitk::Image*>(m_MultiLabelResultNode->GetData());
   mitk::CastToItkImage(multiLabelSegmentation, itkImage);
 
   filter->SetInput(itkImage);
-  filter->SetLowerThreshold(regionID);
-  filter->SetUpperThreshold(regionID);
+  filter->SetLowerThreshold(regionIDs[0]);
+  filter->SetUpperThreshold(regionIDs[0]);
   filter->SetInsideValue(1);
   filter->SetOutsideValue(0);
   filter->Update();
+  itkBinaryTempImage2 = filter->GetOutput();
+
+  itk::OrImageFilter<OutputImageType, OutputImageType>::Pointer orFilter = itk::OrImageFilter<OutputImageType, OutputImageType>::New();
+
+  // if more than one region id is used compute the union of all given binary regions
+  for (std::vector<int>::iterator it = regionIDs.begin() ; it != regionIDs.end(); ++it)
+  {
+    filter->SetLowerThreshold(*it);
+    filter->SetUpperThreshold(*it);
+    filter->SetInsideValue(1);
+    filter->SetOutsideValue(0);
+    filter->Update();
+    itkBinaryTempImage1 = filter->GetOutput();
+
+    orFilter->SetInput1(itkBinaryTempImage1);
+    orFilter->SetInput2(itkBinaryTempImage2);
+
+    orFilter->UpdateLargestPossibleRegion();
+    itkBinaryResultImage = orFilter->GetOutput();
+    itkBinaryTempImage2 = itkBinaryResultImage;
+  }
+  //----------------------------------------------------------------------------------------------------
   mitk::Image::Pointer binarySegmentation;
-  mitk::CastToMitkImage( filter->GetOutput(), binarySegmentation);
+  mitk::CastToMitkImage( itkBinaryResultImage, binarySegmentation);
   m_BinaryPreviewNode->SetData(binarySegmentation);
   m_BinaryPreviewNode->SetVisibility(true);
   m_BinaryPreviewNode->SetProperty("outline binary", mitk::BoolProperty::New(false));
 
   mitk::RenderingManager::GetInstance()->RequestUpdateAll();
 }
 
+//void mitk::OtsuTool3D::UpdateBinaryPreview(int regionID)
+//{
+//  m_MultiLabelResultNode->SetVisibility(false);
+//  //pixel with regionID -> binary image
+//  const unsigned short dim = 3;
+//  typedef unsigned char PixelType;
+//
+//  typedef itk::Image< PixelType, dim > InputImageType;
+//  typedef itk::Image< PixelType, dim > OutputImageType;
+//
+//  typedef itk::BinaryThresholdImageFilter< InputImageType, OutputImageType > FilterType;
+//
+//  FilterType::Pointer filter = FilterType::New();
+//
+//  InputImageType::Pointer itkImage;
+//
+//  mitk::Image::Pointer multiLabelSegmentation = dynamic_cast<mitk::Image*>(m_MultiLabelResultNode->GetData());
+//  mitk::CastToItkImage(multiLabelSegmentation, itkImage);
+//
+//  filter->SetInput(itkImage);
+//  filter->SetLowerThreshold(regionID);
+//  filter->SetUpperThreshold(regionID);
+//  filter->SetInsideValue(1);
+//  filter->SetOutsideValue(0);
+//  filter->Update();
+//  mitk::Image::Pointer binarySegmentation;
+//  mitk::CastToMitkImage( filter->GetOutput(), binarySegmentation);
+//  m_BinaryPreviewNode->SetData(binarySegmentation);
+//  m_BinaryPreviewNode->SetVisibility(true);
+//  m_BinaryPreviewNode->SetProperty("outline binary", mitk::BoolProperty::New(false));
+//
+//  mitk::RenderingManager::GetInstance()->RequestUpdateAll();
+//}
+
 const char* mitk::OtsuTool3D::GetName() const
 {
   return "Otsu";
 }
 
 void mitk::OtsuTool3D::UpdateVolumePreview(bool volumeRendering)
 {
   if (volumeRendering)
   {
     m_MaskedImagePreviewNode->SetBoolProperty("volumerendering", true);
     m_MaskedImagePreviewNode->SetBoolProperty("volumerendering.uselod", true);
   }
   else
   {
     m_MaskedImagePreviewNode->SetBoolProperty("volumerendering", false);
   }
   mitk::RenderingManager::GetInstance()->RequestUpdateAll();
 }
 
 void mitk::OtsuTool3D::ShowMultiLabelResultNode(bool show)
 {
   m_MultiLabelResultNode->SetVisibility(show);
   m_BinaryPreviewNode->SetVisibility(!show);
   mitk::RenderingManager::GetInstance()->RequestUpdateAll();
 }
diff --git a/Modules/Segmentation/Interactions/mitkOtsuTool3D.h b/Modules/Segmentation/Interactions/mitkOtsuTool3D.h
index 4cb64de4f1..7d77946b6f 100644
--- a/Modules/Segmentation/Interactions/mitkOtsuTool3D.h
+++ b/Modules/Segmentation/Interactions/mitkOtsuTool3D.h
@@ -1,62 +1,63 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 #ifndef MITKOTSUTOOL3D_H
 #define MITKOTSUTOOL3D_H
 
 #include <MitkSegmentationExports.h>
 #include "mitkAutoSegmentationTool.h"
 
 namespace us {
 class ModuleResource;
 }
 
 namespace mitk{
   class MitkSegmentation_EXPORT OtsuTool3D : public AutoSegmentationTool
   {
     public:
 
     mitkClassMacro(OtsuTool3D, AutoSegmentationTool);
     itkFactorylessNewMacro(Self)
     itkCloneMacro(Self)
 
       virtual const char* GetName() const;
       virtual const char** GetXPM() const;
     us::ModuleResource GetIconResource() const;
 
       virtual void Activated();
       virtual void Deactivated();
 
       void RunSegmentation( int regions, bool useValley, int numberOfBins);
       void ConfirmSegmentation();
-      void UpdateBinaryPreview(int regionID);
+      //void UpdateBinaryPreview(int regionID);
+      void UpdateBinaryPreview(std::vector<int> regionIDs);
       void UpdateVolumePreview(bool volumeRendering);
       void ShowMultiLabelResultNode(bool);
 
     protected:
       OtsuTool3D();
       virtual ~OtsuTool3D();
 
       mitk::Image::Pointer m_OriginalImage;
       //holds the user selected binary segmentation
       mitk::DataNode::Pointer m_BinaryPreviewNode;
       //holds the multilabel result as a preview image
       mitk::DataNode::Pointer m_MultiLabelResultNode;
       //holds the user selected binary segmentation masked original image
       mitk::DataNode::Pointer m_MaskedImagePreviewNode;
 
   };//class
 }//namespace
 #endif
diff --git a/Modules/SegmentationUI/Qmitk/QmitkOtsuTool3DGUI.cpp b/Modules/SegmentationUI/Qmitk/QmitkOtsuTool3DGUI.cpp
index 6694822d43..e4d6db1064 100644
--- a/Modules/SegmentationUI/Qmitk/QmitkOtsuTool3DGUI.cpp
+++ b/Modules/SegmentationUI/Qmitk/QmitkOtsuTool3DGUI.cpp
@@ -1,160 +1,165 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "QmitkOtsuTool3DGUI.h"
 #include "QmitkConfirmSegmentationDialog.h"
 
 #include <qlabel.h>
 #include <qspinbox.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qlistwidget.h>
 #include <QMessageBox>
 
 MITK_TOOL_GUI_MACRO(MitkSegmentationUI_EXPORT, QmitkOtsuTool3DGUI, "")
 
 QmitkOtsuTool3DGUI::QmitkOtsuTool3DGUI()
 :QmitkToolGUI(),
 m_NumberOfRegions(0)
 {
   m_Controls.setupUi(this);
 
   connect( m_Controls.previewButton, SIGNAL(clicked()), this, SLOT(OnSpinboxValueAccept()));
-  connect(m_Controls.m_selectionListWidget, SIGNAL(itemClicked(QListWidgetItem*)),
-          this, SLOT(OnItemSelectionChanged(QListWidgetItem*)));
+  connect(m_Controls.m_selectionListWidget, SIGNAL(itemSelectionChanged()),
+          this, SLOT(OnItemSelectionChanged()));
   connect( m_Controls.m_ConfSegButton, SIGNAL(clicked()), this, SLOT(OnSegmentationRegionAccept()));
   connect( this, SIGNAL(NewToolAssociated(mitk::Tool*)), this, SLOT(OnNewToolAssociated(mitk::Tool*)) );
+  connect(m_Controls.advancedSettingsButton, SIGNAL(toggled(bool)), this, SLOT(OnAdvancedSettingsButtonToggled(bool)));
+
+  this->OnAdvancedSettingsButtonToggled(false);
 }
 
 QmitkOtsuTool3DGUI::~QmitkOtsuTool3DGUI()
 {
 
 }
 
-void QmitkOtsuTool3DGUI::OnItemSelectionChanged(QListWidgetItem* item)
+void QmitkOtsuTool3DGUI::OnItemSelectionChanged()
 {
-  if (m_SelectedItem == item)
+  m_SelectedItems = m_Controls.m_selectionListWidget->selectedItems();
+
+  if (m_SelectedItems.size() == 0)
   {
-    m_SelectedItem = 0;
-    m_Controls.m_selectionListWidget->clearSelection();
     m_Controls.m_ConfSegButton->setEnabled( false );
     m_OtsuTool3DTool->ShowMultiLabelResultNode(true);
     return;
   }
 
-  m_SelectedItem = item;
-
   if (m_OtsuTool3DTool.IsNotNull())
   {
-    // TODO update preview of region
-    m_OtsuTool3DTool->UpdateBinaryPreview(m_SelectedItem->text().toInt());
-    if ( !m_Controls.m_selectionListWidget->selectedItems().empty() )
-    {
-      m_Controls.m_ConfSegButton->setEnabled( true );
-    }
-    else
-    {
-      m_Controls.m_ConfSegButton->setEnabled( false );
-    }
+    // update preview of region
+    QList<QListWidgetItem *>::Iterator it;
+    std::vector<int> regionIDs;
+    for (it = m_SelectedItems.begin(); it != m_SelectedItems.end(); ++it)
+      regionIDs.push_back((*it)->text().toInt());
+    m_OtsuTool3DTool->UpdateBinaryPreview(regionIDs);
+    m_Controls.m_ConfSegButton->setEnabled( true );
   }
 }
 
+void QmitkOtsuTool3DGUI::OnAdvancedSettingsButtonToggled(bool toggled)
+{
+  m_Controls.m_ValleyCheckbox->setVisible(toggled);
+  m_Controls.binLabel->setVisible(toggled);
+  m_Controls.m_BinsSpinBox->setVisible(toggled);
+}
+
 void QmitkOtsuTool3DGUI::OnNewToolAssociated(mitk::Tool* tool)
 {
   m_OtsuTool3DTool = dynamic_cast<mitk::OtsuTool3D*>( tool );
 }
 
 void QmitkOtsuTool3DGUI::OnSegmentationRegionAccept()
 {
   QmitkConfirmSegmentationDialog dialog;
   QString segName = QString::fromStdString(m_OtsuTool3DTool->GetCurrentSegmentationName());
 
   dialog.SetSegmentationName(segName);
   int result = dialog.exec();
 
   switch(result)
   {
   case QmitkConfirmSegmentationDialog::CREATE_NEW_SEGMENTATION:
     m_OtsuTool3DTool->SetOverwriteExistingSegmentation(false);
     break;
   case QmitkConfirmSegmentationDialog::OVERWRITE_SEGMENTATION:
     m_OtsuTool3DTool->SetOverwriteExistingSegmentation(true);
     break;
   case QmitkConfirmSegmentationDialog::CANCEL_SEGMENTATION:
     return;
   }
 
   if (m_OtsuTool3DTool.IsNotNull() && m_Controls.m_selectionListWidget->currentItem() != NULL)
   {
     m_OtsuTool3DTool->ConfirmSegmentation();
   }
 }
 
 void QmitkOtsuTool3DGUI::OnSpinboxValueAccept()
 {
   if( m_NumberOfRegions == m_Controls.m_Spinbox->value() &&
     m_UseValleyEmphasis == m_Controls.m_ValleyCheckbox->isChecked() &&
     m_NumberOfBins == m_Controls.m_BinsSpinBox->value() )
     return;
 
   if (m_OtsuTool3DTool.IsNotNull())
   {
     try
     {
       m_NumberOfRegions = m_Controls.m_Spinbox->value();
       m_UseValleyEmphasis = m_Controls.m_ValleyCheckbox->isChecked();
       m_NumberOfBins = m_Controls.m_BinsSpinBox->value();
       int proceed;
 
       QMessageBox* messageBox = new QMessageBox(QMessageBox::Question, NULL, "The otsu segmentation computation may take several minutes depending on the number of Regions you selected. Proceed anyway?", QMessageBox::Ok | QMessageBox::Cancel);
       if (m_NumberOfRegions >= 5)
       {
         proceed = messageBox->exec();
         if (proceed != QMessageBox::Ok) return;
       }
       this->setCursor(Qt::WaitCursor);
       m_OtsuTool3DTool->RunSegmentation( m_NumberOfRegions, m_UseValleyEmphasis, m_NumberOfBins );
       this->setCursor(Qt::ArrowCursor);
     }
     catch( ... )
     {
       this->setCursor(Qt::ArrowCursor);
       QMessageBox* messageBox = new QMessageBox(QMessageBox::Critical, NULL, "itkOtsuFilter error: image dimension must be in {2, 3} and no RGB images can be handled.");
       messageBox->exec();
       delete messageBox;
       return;
     }
     //insert regions into widget
     QString itemName;
     QListWidgetItem* item;
     m_Controls.m_selectionListWidget->clear();
     for(int i=0; i<m_Controls.m_Spinbox->value(); ++i)
     {
       itemName = QString::number(i);
       item = new QListWidgetItem(itemName);
       m_Controls.m_selectionListWidget->addItem(item);
     }
     //deactivate 'confirm segmentation'-button
     m_Controls.m_ConfSegButton->setEnabled(false);
   }
 }
 
 void QmitkOtsuTool3DGUI::OnVolumePreviewChecked(int state)
 {
   if (state == 1)
   {
   }
 }
diff --git a/Modules/SegmentationUI/Qmitk/QmitkOtsuTool3DGUI.h b/Modules/SegmentationUI/Qmitk/QmitkOtsuTool3DGUI.h
index 3a59bcdd30..c855b7dd7f 100644
--- a/Modules/SegmentationUI/Qmitk/QmitkOtsuTool3DGUI.h
+++ b/Modules/SegmentationUI/Qmitk/QmitkOtsuTool3DGUI.h
@@ -1,82 +1,86 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef QmitkOtsuTool3DGUI_h_Included
 #define QmitkOtsuTool3DGUI_h_Included
 
 #include "QmitkToolGUI.h"
 #include <MitkSegmentationUIExports.h>
 #include "mitkOtsuTool3D.h"
 #include <QListWidget>
 #include <QPushButton>
 #include "ui_QmitkOtsuToolWidgetControls.h"
 
 class QSpinBox;
 class QLabel;
 
 /**
   \ingroup org_mitk_gui_qt_interactivesegmentation_internal
   \brief GUI for mitk::.
   \sa mitk::
 
   This GUI shows ...
 
   Last contributor: $Author$
 */
 class MitkSegmentationUI_EXPORT QmitkOtsuTool3DGUI : public QmitkToolGUI
 {
   Q_OBJECT
 
   public:
     mitkClassMacro(QmitkOtsuTool3DGUI, QmitkToolGUI);
     itkFactorylessNewMacro(Self)
     itkCloneMacro(Self)
 
   signals:
 
   public slots:
 
   protected slots:
 
     void OnNewToolAssociated(mitk::Tool*);
 
     void OnSpinboxValueAccept();
 
     void OnSegmentationRegionAccept();
 
-    void OnItemSelectionChanged(QListWidgetItem *item);
+    void OnItemSelectionChanged();
 
     void OnVolumePreviewChecked(int);
 
+  private slots:
+
+    void OnAdvancedSettingsButtonToggled(bool toggled);
+
   protected:
 
     QmitkOtsuTool3DGUI();
     virtual ~QmitkOtsuTool3DGUI();
 
     mitk::OtsuTool3D::Pointer m_OtsuTool3DTool;
 
     Ui_QmitkOtsuToolWidgetControls m_Controls;
 
     int m_NumberOfRegions;
 
     bool m_UseValleyEmphasis;
 
     int m_NumberOfBins;
 
-    QListWidgetItem* m_SelectedItem;
+    QList<QListWidgetItem *> m_SelectedItems;
 };
 
 #endif
diff --git a/Modules/SegmentationUI/Qmitk/QmitkOtsuToolWidgetControls.ui b/Modules/SegmentationUI/Qmitk/QmitkOtsuToolWidgetControls.ui
index 2662dd4336..e5484bf97b 100644
--- a/Modules/SegmentationUI/Qmitk/QmitkOtsuToolWidgetControls.ui
+++ b/Modules/SegmentationUI/Qmitk/QmitkOtsuToolWidgetControls.ui
@@ -1,192 +1,214 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkOtsuToolWidgetControls</class>
  <widget class="QWidget" name="QmitkOtsuToolWidgetControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>192</width>
-    <height>239</height>
+    <height>293</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Ignored" vsizetype="Minimum">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="minimumSize">
    <size>
     <width>100</width>
     <height>0</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
     <width>100000</width>
     <height>100000</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>QmitkOtsuToolWidget</string>
   </property>
   <property name="toolTip">
    <string>Move to adjust the segmentation</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="sizeConstraint">
-    <enum>QLayout::SetDefaultConstraint</enum>
-   </property>
-   <property name="margin">
-    <number>0</number>
-   </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <property name="sizeConstraint">
       <enum>QLayout::SetNoConstraint</enum>
      </property>
      <item>
       <widget class="QLabel" name="numberOfRegionsLabel">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Ignored" vsizetype="Minimum">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>Number of Regions:</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QSpinBox" name="m_Spinbox">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="maximumSize">
         <size>
          <width>40</width>
          <height>16777215</height>
         </size>
        </property>
        <property name="minimum">
         <number>2</number>
        </property>
        <property name="maximum">
         <number>32</number>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
+    <widget class="ctkExpandButton" name="advancedSettingsButton">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>32</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>Advanced settings</string>
+     </property>
+     <property name="toolButtonStyle">
+      <enum>Qt::ToolButtonTextBesideIcon</enum>
+     </property>
+     <property name="mirrorOnExpand" stdset="0">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QGridLayout" name="advancedSettingsLayout">
+     <item row="0" column="0">
       <widget class="QCheckBox" name="m_ValleyCheckbox">
        <property name="text">
         <string>Use Valley Emphasis</string>
        </property>
       </widget>
      </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_3">
-     <item>
-      <widget class="QLabel" name="label">
+     <item row="1" column="0">
+      <widget class="QLabel" name="binLabel">
        <property name="text">
         <string>Number of Histogram Bins:</string>
        </property>
       </widget>
      </item>
-     <item>
+     <item row="1" column="1">
       <widget class="QSpinBox" name="m_BinsSpinBox">
        <property name="minimum">
         <number>2</number>
        </property>
        <property name="maximum">
-        <number>2048</number>
+        <number>4096</number>
        </property>
        <property name="value">
         <number>128</number>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QListWidget" name="m_selectionListWidget">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="maximumSize">
       <size>
        <width>10000000</width>
        <height>100</height>
       </size>
      </property>
      <property name="autoScrollMargin">
       <number>0</number>
      </property>
      <property name="selectionMode">
-      <enum>QAbstractItemView::SingleSelection</enum>
+      <enum>QAbstractItemView::MultiSelection</enum>
      </property>
      <property name="resizeMode">
       <enum>QListView::Adjust</enum>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QPushButton" name="previewButton">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="maximumSize">
       <size>
        <width>100000</width>
        <height>16777215</height>
       </size>
      </property>
      <property name="text">
       <string>Preview</string>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QPushButton" name="m_ConfSegButton">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="maximumSize">
       <size>
        <width>100000</width>
        <height>16777215</height>
       </size>
      </property>
      <property name="text">
       <string>Confirm Segmentation</string>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
+ <customwidgets>
+  <customwidget>
+   <class>ctkExpandButton</class>
+   <extends>QToolButton</extends>
+   <header>ctkExpandButton.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>