diff --git a/Modules/Segmentation/Algorithms/mitkFeatureBasedEdgeDetectionFilter.cpp b/Modules/Segmentation/Algorithms/mitkFeatureBasedEdgeDetectionFilter.cpp
new file mode 100644
index 0000000000..0e18d63be6
--- /dev/null
+++ b/Modules/Segmentation/Algorithms/mitkFeatureBasedEdgeDetectionFilter.cpp
@@ -0,0 +1,126 @@
+/*===================================================================
+
+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 "mitkFeatureBasedEdgeDetectionFilter.h"
+
+#include <itkBinaryThresholdImageFilter.h>
+
+#include <SegmentationUtilities/MorphologicalOperations/mitkMorphologicalOperations.h>
+#include <mitkImageAccessByItk.h>
+#include <mitkImageStatisticsCalculator.h>
+#include <mitkImage.h>
+#include <mitkITKImageImport.h>
+#include <mitkMaskImageFilter.h>
+#include <mitkImageToPointCloudFilter.h>
+#include <mitkUnstructuredGrid.h>
+
+mitk::FeatureBasedEdgeDetectionFilter::FeatureBasedEdgeDetectionFilter()
+{
+  m_PointGrid = mitk::UnstructuredGrid::New();
+  m_SegmentationMask = mitk::Image::New();
+  m_thresholdImage = mitk::Image::New();
+
+  this->SetNumberOfRequiredInputs(1);
+  this->SetNumberOfRequiredOutputs(1);
+
+  this->SetNthOutput(0, m_PointGrid);
+}
+
+mitk::FeatureBasedEdgeDetectionFilter::~FeatureBasedEdgeDetectionFilter(){}
+
+void mitk::FeatureBasedEdgeDetectionFilter::GenerateData()
+{
+  mitk::Image::ConstPointer image = ImageToUnstructuredGridFilter::GetInput();
+  mitk::Image::Pointer ncImage = image->Clone();
+
+  //statistics
+  mitk::ImageStatisticsCalculator::Pointer statCalc = mitk::ImageStatisticsCalculator::New();
+  statCalc->SetImage(image);
+  statCalc->SetMaskingModeToImage();
+  if(m_SegmentationMask->IsEmpty())
+  {
+    MITK_WARN << "Please set a segmentation mask first" << std::endl;
+    return;
+  }
+  statCalc->SetImageMask(m_SegmentationMask);
+  statCalc->ComputeStatistics();
+
+  mitk::ImageStatisticsCalculator::Statistics stats = statCalc->GetStatistics();
+  double mean = stats.GetMean();
+  double stdDev = stats.GetSigma();
+
+  double upperThreshold = mean + stdDev;
+  double lowerThreshold = mean - stdDev;
+
+  //thresholding
+  AccessByItk_2(ncImage.GetPointer(), ITKThresholding, lowerThreshold, upperThreshold)
+
+  //fill holes
+  mitk::MorphologicalOperations::FillHoles(m_thresholdImage);
+
+  //masking
+  mitk::MaskImageFilter::Pointer maskFilter = mitk::MaskImageFilter::New();
+  maskFilter->SetInput(image);
+  maskFilter->SetMask(m_thresholdImage);
+  maskFilter->OverrideOutsideValueOn();
+  maskFilter->SetOutsideValue(0);
+  try
+  {
+    maskFilter->Update();
+  }
+  catch(itk::ExceptionObject& excpt)
+  {
+    MITK_ERROR << excpt.GetDescription();
+    return;
+  }
+
+  mitk::Image::Pointer resultImage = maskFilter->GetOutput();
+
+  //imagetopointcloudfilter
+  mitk::ImageToPointCloudFilter::Pointer pclFilter = mitk::ImageToPointCloudFilter::New();
+  pclFilter->SetInput(resultImage);
+  pclFilter->Update();
+
+  m_PointGrid = pclFilter->GetOutput();
+}
+
+template <typename TPixel, unsigned int VImageDimension>
+void mitk::FeatureBasedEdgeDetectionFilter::ITKThresholding( itk::Image<TPixel, VImageDimension>* originalImage, double lower, double upper)
+{
+  typedef itk::Image<TPixel, VImageDimension> ImageType;
+  typedef itk::Image<unsigned char, VImageDimension> SegmentationType;
+  typedef itk::BinaryThresholdImageFilter<ImageType, SegmentationType> ThresholdFilterType;
+
+  typename ThresholdFilterType::Pointer filter = ThresholdFilterType::New();
+  filter->SetInput(originalImage);
+  filter->SetLowerThreshold(lower);
+  filter->SetUpperThreshold(upper);
+  filter->SetInsideValue(1);
+  filter->SetOutsideValue(0);
+  filter->Update();
+
+  m_thresholdImage = mitk::ImportItkImage(filter->GetOutput())->Clone();
+}
+
+void mitk::FeatureBasedEdgeDetectionFilter::SetSegmentationMask(mitk::Image::Pointer segmentation)
+{
+  this->m_SegmentationMask = segmentation;
+}
+
+void mitk::FeatureBasedEdgeDetectionFilter::GenerateOutputInformation()
+{
+  Superclass::GenerateOutputInformation();
+}
diff --git a/Modules/Segmentation/Algorithms/mitkFeatureBasedEdgeDetectionFilter.h b/Modules/Segmentation/Algorithms/mitkFeatureBasedEdgeDetectionFilter.h
new file mode 100644
index 0000000000..f1d14e4e52
--- /dev/null
+++ b/Modules/Segmentation/Algorithms/mitkFeatureBasedEdgeDetectionFilter.h
@@ -0,0 +1,65 @@
+/*===================================================================
+
+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 mitkFeatureBasedEdgeDetectionFilter_h_Included
+#define mitkFeatureBasedEdgeDetectionFilter_h_Included
+
+#include <MitkSurfaceInterpolationExports.h>
+#include <mitkImageToUnstructuredGridFilter.h>
+#include <mitkUnstructuredGrid.h>
+
+#include <itkImage.h>
+#include <itkImageIterator.h>
+
+namespace mitk
+{
+
+class MitkSurfaceInterpolation_EXPORT FeatureBasedEdgeDetectionFilter:
+    public ImageToUnstructuredGridFilter
+{
+
+public:
+
+  mitkClassMacro( FeatureBasedEdgeDetectionFilter, ImageToUnstructuredGridFilter)
+
+  itkFactorylessNewMacro(Self)
+  itkCloneMacro(Self)
+
+  void SetSegmentationMask(mitk::Image::Pointer);
+
+protected:
+
+  virtual void GenerateData();
+
+  virtual void GenerateOutputInformation();
+
+  FeatureBasedEdgeDetectionFilter();
+
+  virtual ~FeatureBasedEdgeDetectionFilter();
+
+  template <typename TPixel, unsigned int VImageDimension>
+  void ITKThresholding( itk::Image<TPixel, VImageDimension>* originalImage, double lower, double upper);
+
+private:
+
+  mitk::UnstructuredGrid::Pointer m_PointGrid;
+  mitk::Image::Pointer m_SegmentationMask;
+  mitk::Image::Pointer m_thresholdImage;
+
+};
+
+}
+#endif
diff --git a/Modules/Segmentation/files.cmake b/Modules/Segmentation/files.cmake
index 59d2b99d96..b21f7c1d47 100644
--- a/Modules/Segmentation/files.cmake
+++ b/Modules/Segmentation/files.cmake
@@ -1,122 +1,123 @@
 set(CPP_FILES
   Algorithms/mitkCalculateSegmentationVolume.cpp
   #Algorithms/mitkContourModelSource.cpp
   #Algorithms/mitkContourModelSubDivisionFilter.cpp
   #Algorithms/mitkContourModelToPointSetFilter.cpp
   #Algorithms/mitkContourModelToSurfaceFilter.cpp
   Algorithms/mitkContourSetToPointSetFilter.cpp
   Algorithms/mitkContourUtils.cpp
   Algorithms/mitkCorrectorAlgorithm.cpp
   Algorithms/mitkDiffImageApplier.cpp
   Algorithms/mitkDiffSliceOperation.cpp
   Algorithms/mitkDiffSliceOperationApplier.cpp
+  Algorithms/mitkFeatureBasedEdgeDetectionFilter.cpp
   Algorithms/mitkImageLiveWireContourModelFilter.cpp
   Algorithms/mitkImageToContourFilter.cpp
   #Algorithms/mitkImageToContourModelFilter.cpp
   Algorithms/mitkImageToLiveWireContourFilter.cpp
   Algorithms/mitkManualSegmentationToSurfaceFilter.cpp
   Algorithms/mitkOtsuSegmentationFilter.cpp
   Algorithms/mitkOverwriteDirectedPlaneImageFilter.cpp
   Algorithms/mitkOverwriteSliceImageFilter.cpp
   Algorithms/mitkSegmentationObjectFactory.cpp
   Algorithms/mitkSegmentationSink.cpp
   Algorithms/mitkShapeBasedInterpolationAlgorithm.cpp
   Algorithms/mitkShowSegmentationAsSmoothedSurface.cpp
   Algorithms/mitkShowSegmentationAsSurface.cpp
   Algorithms/mitkVtkImageOverwrite.cpp
   Controllers/mitkSegmentationInterpolationController.cpp
   Controllers/mitkToolManager.cpp
   Controllers/mitkSegmentationModuleActivator.cpp
   Controllers/mitkToolManagerProvider.cpp
   DataManagement/mitkContour.cpp
   #DataManagement/mitkContourElement.cpp
   #DataManagement/mitkContourModel.cpp
   DataManagement/mitkContourSet.cpp
   DataManagement/mitkExtrudedContour.cpp
   Interactions/mitkAdaptiveRegionGrowingTool.cpp
   Interactions/mitkAddContourTool.cpp
   Interactions/mitkAutoCropTool.cpp
   Interactions/mitkAutoSegmentationTool.cpp
   Interactions/mitkBinaryThresholdTool.cpp
   Interactions/mitkBinaryThresholdULTool.cpp
   Interactions/mitkCalculateGrayValueStatisticsTool.cpp
   Interactions/mitkCalculateVolumetryTool.cpp
   Interactions/mitkContourInteractor.cpp
   Interactions/mitkContourModelInteractor.cpp
   Interactions/mitkContourModelLiveWireInteractor.cpp
   Interactions/mitkContourTool.cpp
   Interactions/mitkCorrectorTool2D.cpp
   Interactions/mitkCreateSurfaceTool.cpp
   Interactions/mitkDrawPaintbrushTool.cpp
   Interactions/mitkErasePaintbrushTool.cpp
   Interactions/mitkEraseRegionTool.cpp
   Interactions/mitkExtrudedContourInteractor.cpp
   Interactions/mitkFastMarchingTool.cpp
   Interactions/mitkFastMarchingTool3D.cpp
   Interactions/mitkFeedbackContourTool.cpp
   Interactions/mitkFillRegionTool.cpp
   Interactions/mitkLiveWireTool2D.cpp
   Interactions/mitkOtsuTool3D.cpp
   Interactions/mitkPaintbrushTool.cpp
   Interactions/mitkPixelManipulationTool.cpp
   Interactions/mitkRegionGrow3DTool.cpp
   Interactions/mitkRegionGrowingTool.cpp
   Interactions/mitkSegmentationsProcessingTool.cpp
   Interactions/mitkSetRegionTool.cpp
   Interactions/mitkSegTool2D.cpp
   Interactions/mitkSubtractContourTool.cpp
   Interactions/mitkTool.cpp
   Interactions/mitkToolCommand.cpp
   Interactions/mitkWatershedTool.cpp
   Interactions/mitkPickingTool.cpp
   #IO/mitkContourModelIOFactory.cpp
   #IO/mitkContourModelReader.cpp
   #IO/mitkContourModelWriter.cpp
   #IO/mitkContourModelWriterFactory.cpp
   Rendering/mitkContourMapper2D.cpp
   #Rendering/mitkContourModelGLMapper2D.cpp
   #Rendering/mitkContourModelMapper2D.cpp
   #Rendering/mitkContourModelMapper3D.cpp
   Rendering/mitkContourSetMapper2D.cpp
   Rendering/mitkContourSetVtkMapper3D.cpp
   Rendering/mitkContourVtkMapper3D.cpp
   SegmentationUtilities/BooleanOperations/mitkBooleanOperation.cpp
   SegmentationUtilities/MorphologicalOperations/mitkMorphologicalOperations.cpp
 )
 
 set(RESOURCE_FILES
   Add_48x48.png
   Add_Cursor_32x32.png
   Correction_48x48.png
   Correction_Cursor_32x32.png
   Erase_48x48.png
   Erase_Cursor_32x32.png
   FastMarching_48x48.png
   FastMarching_Cursor_32x32.png
   Fill_48x48.png
   Fill_Cursor_32x32.png
   LiveWire_48x48.png
   LiveWire_Cursor_32x32.png
   Otsu_48x48.png
   Paint_48x48.png
   Paint_Cursor_32x32.png
   Pick_48x48.png
   RegionGrowing_48x48.png
   RegionGrowing_Cursor_32x32.png
   Subtract_48x48.png
   Subtract_Cursor_32x32.png
   Threshold_48x48.png
   TwoThresholds_48x48.png
   Watershed_48x48.png
   Watershed_Cursor_32x32.png
   Wipe_48x48.png
   Wipe_Cursor_32x32.png
 
   Interactions/dummy.xml
   Interactions/LiveWireTool.xml
   Interactions/PressMoveRelease.xml
   Interactions/PressMoveReleaseAndPointSetting.xml
   Interactions/PressMoveReleaseWithCTRLInversion.xml
   Interactions/PressMoveReleaseWithCTRLInversionAllMouseMoves.xml
   Interactions/SegmentationToolsConfig.xml
 )