diff --git a/Modules/ImageStatistics/mitkPointSetStatisticsCalculator.h b/Modules/ImageStatistics/mitkPointSetStatisticsCalculator.h
index 4cff5cedba..8fb8d2a61e 100644
--- a/Modules/ImageStatistics/mitkPointSetStatisticsCalculator.h
+++ b/Modules/ImageStatistics/mitkPointSetStatisticsCalculator.h
@@ -1,116 +1,118 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date: 2009-05-12 19:56:03 +0200 (Di, 12 Mai 2009) $
 Version:   $Revision: 17179 $
 
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
 
 This software is distributed WITHOUT ANY WARRANTY; without even
 the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
 
 #ifndef _MITK_PointSetSTATISTICSCALCULATOR_H
 #define _MITK_PointSetSTATISTICSCALCULATOR_H
 
 #include <itkObject.h>
 #include "ImageStatisticsExports.h"
 #include <mitkPointSet.h>
 
 namespace mitk
 {
 
 /**
  * \brief Class for calculating statistics (like standard derivation, RMS, mean, etc.) for a PointSet.
  */
 class ImageStatistics_EXPORT PointSetStatisticsCalculator : public itk::Object
 {
 public: 
   
   mitkClassMacro( PointSetStatisticsCalculator, itk::Object );
   itkNewMacro( PointSetStatisticsCalculator );
 
   mitkNewMacro1Param(PointSetStatisticsCalculator,mitk::PointSet::Pointer)
 
   /** @brief Sets the point set which will be analysed. */
   void SetPointSet(mitk::PointSet::Pointer pSet);
 
   /** @return Returns the mean position of the analysed point set.*/
   mitk::Point3D GetPositionMean();
   
   /** @return Returns the standard derivation of each component (x, y and z) of the analysed point set.*/
   mitk::Vector3D GetPositionStandardDeviation();
   
   /** @return Returns the sample standard derivation of each component (x, y and z) of the analysed point set.*/
   mitk::Vector3D GetPositionSampleStandardDeviation();
 
   /** @return Returns the mean distance to the mean postion (=mean error) of the analysed point set. */
   double GetPositionErrorMean();
   
   /** @return Returns the standard derivation of the errors of all positions of the analysed point set. */
   double GetPositionErrorStandardDeviation();
  
   /** @return Returns the sample standard derivation of the errors of all positions of the analysed point set. */
   double GetPositionErrorSampleStandardDeviation();
 
   /** @return Returns the RMS of the errors of all positions of the analysed point set. */
   double GetPositionErrorRMS();
  
   /** @return Returns the median of the errors of all positions of the analysed point set. */
   double GetPositionErrorMedian();
  
   /** @return Returns the maximum of the errors of all positions of the analysed point set. */
   double GetPositionErrorMax();
  
   /** @return Returns the minimum of the errors of all positions of the analysed point set. */
   double GetPositionErrorMin();
 
   //#####################################################################################################
 
   //this both methods are used by another class an so they are public... perhaps we want to move them
   //out of this class because they have nothing to do with point sets.
 
   /** @return returns the standard derivation of the given list (NOT of the point set).*/
   double GetStabw(std::vector<double> list);
 
   /** @return returns the sample standard derivation of the given list (NOT of the point set).*/
   double GetSampleStabw(std::vector<double> list);
 
   //#####################################################################################################
 
  
 protected:
   
   PointSetStatisticsCalculator();
   PointSetStatisticsCalculator(mitk::PointSet::Pointer);
   virtual ~PointSetStatisticsCalculator();
 
+  // TODO: Remove the std::vector<mitk::Point3D> data structure and use mitk::PointSet everywhere
+  
   /** @return Returns a list with the distances to the mean of the list */
   std::vector<double> GetErrorList(std::vector<mitk::Point3D> list);
 
   mitk::Point3D GetMean(std::vector<mitk::Point3D> list);
 
   /** @brief Converts a point set to a vector of Point3D. */
   std::vector<mitk::Point3D> PointSetToVector(mitk::PointSet::Pointer pSet);
 
   mitk::PointSet::Pointer m_PointSet;
 
   double GetMean(std::vector<double> list);
 
   double GetMedian(std::vector<double> list);
 
   double GetMax(std::vector<double> list);
 
   double GetMin(std::vector<double> list);
   
 };
 
 }
 
 #endif // #define _MITK_PointSetSTATISTICSCALCULATOR_H
\ No newline at end of file