diff --git a/Wrapping/Common/mitk_swig_classes.i b/Wrapping/Common/mitk_swig_classes.i
index 9241ec56b9..ab7c6cbbd5 100644
--- a/Wrapping/Common/mitk_swig_classes.i
+++ b/Wrapping/Common/mitk_swig_classes.i
@@ -1,157 +1,208 @@
-
 //
 // Defining some Macros that make problems with SWIG as the
 // corresponding definitions are not included by default.
 // Luckely, these includes are not necessary for SWIG.
 //
 #define ITK_NOEXCEPT
 #define ITKCommon_EXPORT
 #define ITK_OVERRIDE
 #define MITKCORE_EXPORT
 #define MITKCLCORE_EXPORT
 #define MITKCLUTILITIES_EXPORT
 #define ITKCommon_EXPORT
 #define MITKMATCHPOINTREGISTRATION_EXPORT
 #define MAPDeployment_EXPORT
 #define MAPAlgorithms_EXPORT
 #define MITKSEGMENTATION_EXPORT
 #define MITKMULTILABEL_EXPORT
+#define MITKBASICIMAGEPROCESSING_EXPORT
+
+#define VCL_TEMPLATE_EXPORT
 
 #define ITKCommon_EXPORT
 #define ITK_FORWARD_EXPORT
 #define ITK_OVERRIDE
 #define ITK_NOEXCEPT
 
 
 %include <itkMacro.h>
 %include <mitkCommon.h>
 %include <itkSmartPointer.h>
 %include <mitkPixelType.h>
 %include <mitkChannelDescriptor.h>
 %include <mitkIOUtil.h>
 
-
 #define DEPRECATED(func) func
 #undef ITK_DISALLOW_COPY_AND_ASSIGN
 #define ITK_DISALLOW_COPY_AND_ASSIGN(TypeName)
 
+typedef double ScalarType;
+typedef Vector3D mitk::Vector3D;
+
 %pythoncode %{
  convertion_list = {}
 %}
 
 SWIG_ADD_NONOBJECT_CLASS(Indent, itkIndent.h, itk)
 SWIG_ADD_MITK_CLASS(LightObject, itkLightObject.h, itk)
 SWIG_ADD_MITK_CLASS(Object, itkObject.h, itk)
 SWIG_ADD_MITK_CLASS(DataObject, itkDataObject.h, itk)
 
 SWIG_ADD_MITK_CLASS(TimeGeometry, mitkTimeGeometry.h, mitk)
 SWIG_ADD_MITK_CLASS(ArbitraryTimeGeometry, mitkArbitraryTimeGeometry.h, mitk)
 SWIG_ADD_MITK_CLASS(ProportionalTimeGeometry, mitkProportionalTimeGeometry.h, mitk)
 SWIG_ADD_MITK_CLASS(BaseGeometry, mitkBaseGeometry.h, mitk)
 SWIG_ADD_MITK_CLASS(Geometry3D, mitkGeometry3D.h, mitk)
 SWIG_ADD_MITK_CLASS(SlicedGeometry3D, mitkSlicedGeometry3D.h, mitk)
 SWIG_ADD_MITK_CLASS(PlaneGeometry , mitkPlaneGeometry.h, mitk)
 
-SWIG_ADD_NONOBJECT_NOVECTOR_CLASS(BoundingBox, mitkBaseGeometry.h, mitk)
+%rename(itk_BoundingBox) itk::BoundingBox;
+%include <mitkBaseGeometry.h>
+%{
+#include < mitkBaseGeometry.h >
+typedef mitk::BoundingBox BoundingBox;
+%}
+%template(VectorBoundingBoxPointer) std::vector< mitk::BoundingBox * >;
+
+
+//SWIG_ADD_NONOBJECT_NOVECTOR_CLASS(BoundingBox, mitkBaseGeometry.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(TimeBounds, mitkBaseGeometry.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(FixedArrayType, mitkBaseGeometry.h, mitk)
 
 SWIG_ADD_NONOBJECT_CLASS(Point2D, mitkPoint.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(Point3D, mitkPoint.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(Point4D, mitkPoint.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(Point2I, mitkPoint.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(Point3I, mitkPoint.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(Point4I, mitkPoint.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(VnlVector, mitkVector.h, mitk)
-SWIG_ADD_NONOBJECT_CLASS(Vector2D, mitkVector.h, mitk)
-SWIG_ADD_NONOBJECT_CLASS(Vector3D, mitkVector.h, mitk)
-SWIG_ADD_NONOBJECT_CLASS(Vector4D, mitkVector.h, mitk)
+%ignore rBegin() const;
+%ignore rEnd() const;
+%ignore rBegin();
+%ignore rEnd();
+%ignore itk::Vector::GetVnlVector;
+%ignore itk::Vector::Get_vnl_vector;
+%ignore itk::Vector::Get_vnl_vector const;
+
+%{
+  #include <itkFixedArray.h>
+  #include <itkVector.h>
+  #include <vnl/vnl_vector_ref.h>
+  typedef vnl_vector_ref<ScalarType> VnlVectorRef;
+%}
+//%include <vnl/vnl_vector_ref.h>
+//MITKSWIG_ADD_CLASS(VnlVectorRef, mitkVector.h,)
+//typedef ::VnlVectorRef VnlVectorRef;
+class VnlVectorRef;
+%template(VectorVnlVectorRefPointer) std::vector<::VnlVectorRef * >;
+//SWIG_ADD_NONOBJECT_NOVECTOR_CLASS(VnlVectorRef, mitkVector.h, )
+
+%include <itkFixedArray.h>
+%include <itkVector.h>
+class itk::FixedArray<ScalarType, 3>::ReverseIterator;
+//%template(VnlVectorRef) vnl_vector_ref<ScalarType>;
+%template(itkFixedArray3D) itk::FixedArray<ScalarType, 3>;
+%template(itkVector2D) itk::Vector<ScalarType, 2>;
+%template(itkVector3D) itk::Vector<ScalarType, 3>;
+%template(itkVector4D) itk::Vector<ScalarType, 4>;
+
+
+SWIG_ADD_NONOBJECT_TEMPLATE_CLASS(Vector2D, mitkVector.h, mitk)
+%template(Vector2D) mitk::Vector<ScalarType, 2>;
+SWIG_ADD_NONOBJECT_TEMPLATE_CLASS(Vector3D, mitkVector.h, mitk)
+%template(Vector3D) mitk::Vector<ScalarType, 3>;
+SWIG_ADD_NONOBJECT_TEMPLATE_CLASS(Vector4D, mitkVector.h, mitk)
+%template(Vector4D) mitk::Vector<ScalarType, 4>;
 
 SWIG_ADD_MITK_CLASS(BaseData, mitkBaseData.h, mitk)
 SWIG_ADD_MITK_CLASS(SlicedData, mitkSlicedData.h, mitk)
 SWIG_ADD_MITK_CLASS(Image, mitkImage.h, mitk)
 SWIG_ADD_MITK_CLASS(LabelSetImage, mitkLabelSetImage.h, mitk)
 SWIG_ADD_MITK_CLASS(PointSet, mitkPointSet.h, mitk)
 %{
 using mitk::Message;
 %}
 
 //
 // Phenotyping Related Classes
 //
 SWIG_ADD_MITK_CLASS(AbstractGlobalImageFeature, mitkAbstractGlobalImageFeature.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFImageDescriptionFeatures, mitkGIFImageDescriptionFeatures.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFFirstOrderStatistics, mitkGIFFirstOrderStatistics.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFFirstOrderHistogramStatistics, mitkGIFFirstOrderHistogramStatistics.h, mitk)
+SWIG_ADD_MITK_CLASS(GIFFirstOrderNumericStatistics, mitkGIFFirstOrderNumericStatistics.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFVolumetricStatistics, mitkGIFVolumetricStatistics.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFVolumetricDensityStatistics, mitkGIFVolumetricDensityStatistics.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFCooccurenceMatrix2, mitkGIFCooccurenceMatrix2.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFNeighbouringGreyLevelDependenceFeature, mitkGIFNeighbouringGreyLevelDependenceFeatures.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFGreyLevelRunLength, mitkGIFGreyLevelRunLength.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFGreyLevelSizeZone, mitkGIFGreyLevelSizeZone.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFGreyLevelDistanceZone, mitkGIFGreyLevelDistanceZone.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFLocalIntensity, mitkGIFLocalIntensity.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFIntensityVolumeHistogramFeatures, mitkGIFIntensityVolumeHistogramFeatures.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFNeighbourhoodGreyToneDifferenceFeatures, mitkGIFNeighbourhoodGreyToneDifferenceFeatures.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFCurvatureStatistic, mitkGIFCurvatureStatistic.h, mitk)
 
 //
 // Conversion and Segmentation based Classes
 //
 SWIG_ADD_MITK_CLASS(ContourModelSetToImageFilter, mitkContourModelSetToImageFilter.h, mitk)
 SWIG_ADD_NONOBJECT_NOVECTOR_CLASS(BooleanOperation, mitkBooleanOperation.h, mitk)
 SWIG_ADD_NONOBJECT_NOVECTOR_CLASS(MorphologicalOperations, mitkMorphologicalOperations.h, mitk)
+//SWIG_ADD_NONOBJECT_NOVECTOR_CLASS(MaskCleaningOperation, mitkMaskCleaningOperation.h, mitk)
+//SWIG_ADD_NONOBJECT_NOVECTOR_CLASS(TransformationOperation, mitkTransformationOperation.h, mitk)
+//SWIG_ADD_NONOBJECT_NOVECTOR_CLASS(ArithmeticOperation, mitkArithmeticOperation.h, mitk)
 %{
   #include <itkProcessObject.h>
   typedef itk::DataObject::DataObjectIdentifierType DataObjectIdentifierType;
   typedef itk::ProcessObject::DataObjectPointerArraySizeType DataObjectPointerArraySizeType;
 %}
 
 //
 // MatchPoint Related Classes
 //
 %ignore DLLHandle::LibraryHandleType;
 
 %{
 #include <mapDeploymentDLLHandle.h>
 namespace core
 {
   typedef std::string String;
 }
 typedef map::deployment::DLLHandle::LibraryHandleType LibraryHandleType;
 typedef map::deployment::DLLHandle DLLHandle;
 %}
 namespace core
 {
   typedef std::string String;
 }
 
 %nodefaultctor LibraryHandleType;
 struct LibraryHandleType {};
 
 %include <mapUID.h>
 SWIG_ADD_MITK_CLASS(UID,mapUID.h, map::algorithm)
 SWIG_ADD_MITK_CLASS(DLLInfo, mapDeploymentDLLInfo.h, map::deployment)
 //SWIG_ADD_MITK_CLASS_VECTORFREE(DLLHandle, mapDeploymentDLLHandle.h, map::deployment)
 
 SWIG_ADD_MITK_CLASS_VECTORFREE(DLLDirectoryBrowser, mapDeploymentDLLDirectoryBrowser.h, ::map::deployment)
 MITKSWIG_ADD_HEADERFILE(mapDeploymentDLLAccess.h)
 %{
  DLLHandle const *  ConvertDLLHandleSmartPointerToPointer(itk::SmartPointer<map::deployment::DLLHandle> p)
  {
    return p.GetPointer();
  }
 %}
 DLLHandle const * ConvertDLLHandleSmartPointerToPointer(DLLHandle::Pointer p);
 
 MITKSWIG_ADD_CLASS(MAPAlgorithmHelper, mitkMAPAlgorithmHelper.h, mitk)
 MITKSWIG_ADD_CLASS(RegistrationType, mitkImageMappingHelper.h, mitk::ImageMappingHelper)
 MITKSWIG_ADD_CLASS(MITKRegistrationType, mitkImageMappingHelper.h, mitk::ImageMappingHelper)
 
 // SWIG_ADD_MITK_CLASS(FastSymmetricForcesDemonsMultiResDefaultRegistrationAlgorithm, mitkFastSymmetricForcesDemonsMultiResDefaultRegistrationAlgorithm.h, mitk)
 // SWIG_ADD_MITK_CLASS(LevelSetMotionMultiResDefaultRegistrationAlgorithm, mitkLevelSetMotionMultiResDefaultRegistrationAlgorithm.h, mitk)
 // SWIG_ADD_MITK_CLASS(MultiModalAffineDefaultRegistrationAlgorithm, mitkMultiModalAffineDefaultRegistrationAlgorithm.h, mitk)
 // SWIG_ADD_MITK_CLASS(MultiModalRigidDefaultRegistrationAlgorithm, mitkMultiModalRigidDefaultRegistrationAlgorithm.h, mitk)
 // SWIG_ADD_MITK_CLASS(MultiModalTransDefaultRegistrationAlgorithm, mitkMultiModalTransDefaultRegistrationAlgorithm.h, mitk)
 // SWIG_ADD_MITK_CLASS(RigidClosedFormPointsDefaultRegistrationAlgorithm, mitkRigidClosedFormPointsDefaultRegistrationAlgorithm.h, mitk)
 // SWIG_ADD_MITK_CLASS(RigidICPDefaultRegistrationAlgorithm, mitkRigidICPDefaultRegistrationAlgorithm.h, mitk)
\ No newline at end of file
diff --git a/Wrapping/Common/mitk_swig_macros.i b/Wrapping/Common/mitk_swig_macros.i
index f3f8c589a5..a97330427f 100644
--- a/Wrapping/Common/mitk_swig_macros.i
+++ b/Wrapping/Common/mitk_swig_macros.i
@@ -1,232 +1,257 @@
 //
 // This file contains macros for swig.
 //
 
 
 
 //
 // MITKSWIG_ADD_HEADERFILE includes a header-file into SWIG
 //
 %define MITKSWIG_ADD_HEADERFILE( classinclude )
   // Include the given header, where the class definition is found
   %include < ## classinclude ## >
 
   // Include the include file in the generated cpp file
   %{
    #include < ## classinclude ## >
   %}
 
 %enddef
 
 //
 // MITKSWIG_ADD_CLASS is a helper macro in order to do
 // all important stuff in order to wrap an existing
 // class
 //
 %define MITKSWIG_ADD_CLASS(classname, classinclude, nspace)
   MITKSWIG_ADD_HEADERFILE( classinclude )
   // Using class name in order to remove ambigiouties
   %{
     typedef nspace ## :: ## classname classname ## ;
     using nspace ## :: ## classname ;
   %}
   using nspace ##:: ## classname ;
 
   // Typedef is necessary to overcome ambigiouties resulting in the fact that SWIG
   // ignores namespaces. This can lead to some problems with templates.
   typedef nspace ## :: ## classname classname ## ;
 %enddef
 
 
 //
 // MITKSWIG_AUTOMATED_CASTING is a helper macro in order to
 // provide a convinience interface for up/downcasting of
 // classes
 //
 %define MITKSWIG_AUTOMATED_CASTING(classname, classinclude, nspace)
 
   // Define a conversion method to convert from and to types
   %template(ConvertTo ## classname) ConvertTo< nspace ##:: ## classname ## >;
 
   // This extend is necessary to have the automatic cast methods available
 %extend itk::SmartPointer< nspace ## :: ## classname ## ::Self> {
   %pythoncode %{
       def _GetListOfValidItems(self):
-        return [str(k) for k in self.GetClassHierarchy() if str(k) in convertion_list.keys() ]
+        return [str(k).replace("class itk::","") for k in self.GetClassHierarchy() if str(k).replace("class itk::","") in convertion_list.keys() ]
   %}
   %pythoncode %{
     def __getattr__(self, item):
         if type(item)==str:
             if (len(item) > 9) and ('ConvertTo' in item):
                 searchString=item[9:]
                 if searchString in self._GetListOfValidItems():
                     def func_t():
                         return convertion_list[searchString](self)
                     return func_t
   %}
   %pythoncode %{
     def __dir__(self):
         return super().__dir__() + ['ConvertTo'+k for k in self._GetListOfValidItems()]
   %}
 }
 
 %extend  std::vector< nspace ## :: ## classname *>::value_type {
   %pythoncode %{
       def _GetListOfValidItems(self):
         return [str(k) for k in self.GetClassHierarchy() if str(k) in convertion_list.keys() ]
   %}
   %pythoncode %{
     def __getattr__(self, item):
         if type(item)==str:
             if (len(item) > 9) and ('ConvertTo' in item):
                 searchString=item[9:]
                 if searchString in self._GetListOfValidItems():
                     def func_t():
                         return convertion_list[searchString](self)
                     return func_t
   %}
   %pythoncode %{
     def __dir__(self):
         return super().__dir__() + ['ConvertTo'+k for k in self._GetListOfValidItems()]
   %}
 }
 
 %pythoncode %{
  convertion_list['classname'] = ConvertTo ## classname
 %}
 
 %enddef
 
 //
 // MITKSWIG_SMARTPOINTERVECTOR : Wrapper for Vectors of Smartpointer-Classes
 //
 %define MITKSWIG_SMARTPOINTERVECTOR(classname, classinclude, nspace)
   // Initianziation of std. vectors containing pointers to these classes. This allows to use
   // vectors of these types as target language arrays.
   %template(Vector ## classname ## Pointer) std::vector< nspace ## :: ## classname ## ::Pointer >;
   %template(Vector ## classname) std::vector< nspace ## :: ## classname ## ::Self *>;
 %enddef
 
 //
 // MITKSWIG_POINTERVECTOR : Wrapper for Vectors of Classes
 //
 %define MITKSWIG_POINTERVECTOR(classname, classinclude, nspace)
   // Initianziation of std. vectors containing pointers to these classes. This allows to use
   // vectors of these types as target language arrays.
   %template(Vector ## classname ## Pointer) std::vector< nspace ## :: ## classname * >;
   %template(Vector ## classname) std::vector< nspace ## :: ## classname  >;
 %enddef
 
 //
 // MITKSWIG_MITKSMARTPOINTER_INITIALIZATION : Wrapper for Vectors of Smartpointer-Classes
 //
 %define MITKSWIG_MITKSMARTPOINTER_INITIALIZATION(classname, classinclude, nspace)
 
   // Declaring that this class is a smart-pointer class, in order to handle
   // online upcasting where necessary (for example python)
+  %feature("smartptr", noblock=1) classname { classname ## ::Pointer }
+  %feature("smartptr", noblock=1) nspace ##:: ## classname { nspace ## :: ## classname ## ::Pointer }
+  %feature("smartptr", noblock=1) nspace ##:: ## classname { classname ## ::Pointer }
   %feature("smartptr", noblock=1) nspace ##:: ## classname { itk::SmartPointer<nspace ## :: ## classname ## ::Self> }
 %enddef
 
 //
 // MITKSWIG_MITKSMARTPOINTER_TEMPLATE : Wrapper for Vectors of Smartpointer-Classes
 //
 %define MITKSWIG_MITKSMARTPOINTER_TEMPLATE(classname, classinclude, nspace)
   // Defining the Smartpointer, allows easy access in target language
   %template(classname ## Pointer) itk::SmartPointer<nspace ## :: ## classname ## ::Self>;
 
 %enddef
 
 
 //
 // SWIG_ADD_MITK_CLASS is a helper macro in order to do
 // all important stuff before an mitk::Class is included.
 // Requires the name of the class as it is in c++ as classname
 // and the include file, in which the class is defined.
 // It is assumed that the class is somehow inherited from
 // mitk::BaseData, and supports smartpointers.
 //
 %define SWIG_ADD_MITK_CLASS_VECTORFREE(classname, classinclude, nspace)
   %include < ## classinclude ## >
   MITKSWIG_MITKSMARTPOINTER_INITIALIZATION(classname, classinclude, nspace)
 
   MITKSWIG_ADD_CLASS( classname, classinclude, nspace )
 
+  //class classname ## ;
+  //class classname ## ::Pointer;
+
   class nspace ## :: ## classname ## ;
   class nspace ## :: ## classname ## ::Pointer;
 
   MITKSWIG_MITKSMARTPOINTER_TEMPLATE(classname, classinclude, nspace)
 
   MITKSWIG_AUTOMATED_CASTING(classname, classinclude, nspace)
 %enddef
 
 //
 // SWIG_ADD_MITK_CLASS is a helper macro in order to do
 // all important stuff before an mitk::Class is included.
 // Requires the name of the class as it is in c++ as classname
 // and the include file, in which the class is defined.
 // It is assumed that the class is somehow inherited from
 // mitk::BaseData, and supports smartpointers.
 //
 %define SWIG_ADD_MITK_CLASS(classname, classinclude, nspace)
   %include < ## classinclude ## >
   MITKSWIG_MITKSMARTPOINTER_INITIALIZATION(classname, classinclude, nspace)
 
   MITKSWIG_ADD_CLASS( classname, classinclude, nspace )
 
-
+  // Defining only the original classname
+  // If the ::Pointer is also defined, smartpointer won't work
   class nspace ## :: ## classname ## ;
-  class nspace ## :: ## classname ## ::Pointer;
+  //class nspace ## :: ## classname ## ::Pointer;
 
   // It is important to first define the Vectors and
   // then define the Smartpointer. Otherwise a SWIG-bug ...
   MITKSWIG_SMARTPOINTERVECTOR(classname, classinclude, nspace)
 
   MITKSWIG_MITKSMARTPOINTER_TEMPLATE(classname, classinclude, nspace)
 
   MITKSWIG_AUTOMATED_CASTING(classname, classinclude, nspace)
 %enddef
 
 
 //
 // SWIG_ADD_NONOBJECT_CLASS is a helper macro in order to do
 // all important stuff before an mitk::Class is included.
 // Requires the name of the class as it is in c++ as classname
 // and the include file, in which the class is defined.
 // It is assumed that the class is somehow inherited from
 // mitk::BaseData, and supports smartpointers.
 //
 %define SWIG_ADD_NONOBJECT_CLASS(classname, classinclude, nspace)
   %include < ## classinclude ## >
   MITKSWIG_ADD_CLASS( classname, classinclude, nspace )
 
   // Typedef is necessary to overcome ambigiouties resulting in the fact that SWIG
   // ignores namespaces. This can lead to some problems with templates.
   typedef nspace ## :: ## classname classname ## ;
 
   class nspace ## :: ## classname ## ;
 
   MITKSWIG_POINTERVECTOR(classname, classinclude, nspace)
 %enddef
 
+//
+// SWIG_ADD_NONOBJECT_CLASS is a helper macro in order to do
+// all important stuff before an mitk::Class is included.
+// Requires the name of the class as it is in c++ as classname
+// and the include file, in which the class is defined.
+// It is assumed that the class is somehow inherited from
+// mitk::BaseData, and supports smartpointers.
+//
+%define SWIG_ADD_NONOBJECT_TEMPLATE_CLASS(classname, classinclude, nspace)
+  %include < ## classinclude ## >
+  MITKSWIG_ADD_CLASS( classname, classinclude, nspace )
+
+  //%template(classname) templateArgs;
+  //class nspace ## :: ## classname ## ;
+
+  MITKSWIG_POINTERVECTOR(classname, classinclude, nspace)
+%enddef
+
 
 //
 // SWIG_ADD_NONOBJECT_CLASS is a helper macro in order to do
 // all important stuff before an mitk::Class is included.
 // Requires the name of the class as it is in c++ as classname
 // and the include file, in which the class is defined.
 // It is assumed that the class is somehow inherited from
 // mitk::BaseData, and supports smartpointers.
 //
 %define SWIG_ADD_NONOBJECT_NOVECTOR_CLASS(classname, classinclude, nspace)
   %include < ## classinclude ## >
   MITKSWIG_ADD_CLASS( classname, classinclude, nspace )
 
   // Typedef is necessary to overcome ambigiouties resulting in the fact that SWIG
   // ignores namespaces. This can lead to some problems with templates.
   typedef nspace ## :: ## classname classname ## ;
 
   // Initianziation of std. vectors containing pointers to these classes. This allows to use
   // vectors of these types as target language arrays.
   %template(Vector ## classname ## Pointer) std::vector< nspace ## :: ## classname * >;
 
-%enddef
+%enddef
\ No newline at end of file
diff --git a/Wrapping/Python/CMakeLists.txt b/Wrapping/Python/CMakeLists.txt
index 260623b192..8a488c3318 100644
--- a/Wrapping/Python/CMakeLists.txt
+++ b/Wrapping/Python/CMakeLists.txt
@@ -1,77 +1,77 @@
 # Version 2.8.1 is the minium requirement for this script.
 # this is lower than the general minimum requirement.
 #cmake_minimum_required ( VERSION 2.8.1 FATAL_ERROR )
 
 include(mitkTargetLinkLibrariesWithDynamicLookup)
 
 project( MITK_Python )
 
 set(CMAKE_SHARED_LINKER_FLAGS "" CACHE INTERNAL "" FORCE)
 set(CMAKE_MODULE_LINKER_FLAGS "" CACHE INTERNAL "" FORCE)
 
 mitk_check_dynamic_lookup(MODULE
   SHARED
   MITK_UNDEFINED_SYMBOLS_ALLOWED
   )
 
 #
 # Find the necessary libraries etc..
 #
 
 if ( MITK_UNDEFINED_SYMBOLS_ALLOWED )
   set( _QUIET_LIBRARY "QUIET" )
 else()
   set( _QUIET_LIBRARY "REQUIRED" )
 endif()
 
 find_package ( PythonInterp REQUIRED )
 find_package ( PythonLibs ${_QUIET_LIBRARY} )
 include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} )
 #
 # Options
 #
 option ( MITK_PYTHON_THREADS "Enable threaded python usage by unlocking the GIL." ON )
 mark_as_advanced( MITK_PYTHON_THREADS )
 option ( MITK_PYTHON_EGG "Add building of python eggs to the dist target." OFF )
 mark_as_advanced( MITK_PYTHON_EGG )
 option ( MITK_PYTHON_WHEEL "Add building of python wheels to the dist target." ON )
 mark_as_advanced( MITK_PYTHON_WHEEL )
 
 # Prepare the SWIG-File, i.e. especially add necessary include folders
 mitkSwigPrepareFiles(pyMITK MITK.i "MitkCore;MitkCLCore;MitkCLUtilities;ITKCommon;MitkMatchPointRegistration;MitkSegmentation;MitkMultilabel;MitkDICOM;MitkDICOMImageIO;MitkRT")
 
 # Add additional SWIG Parameters
 # These parameters depend on the target language
 set(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_GLOBAL_FLAGS} -features autodoc=1 -keyword )
 if( MITK_PYTHON_THREADS )
   set(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} -threads)
 endif()
-set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR})
+set(CMAKE_SWIG_OUTDIR ${MITK_BINARY_DIR}/lib/Release)
 
 # Create the actual SWIG project
-swig_add_module(pyMITK python MITK.i )
+swig_add_library(pyMITK LANGUAGE python SOURCES MITK.i )
 
 mitkSwigAddLibraryDependencies(pyMITK "MitkCore;MitkCLCore;MitkCLUtilities;ITKCommon;MitkMatchPointRegistration;MitkSegmentation;MitkMultilabel;MitkDICOM;MitkDICOMImageIO;MitkRT")
 mitk_target_link_libraries_with_dynamic_lookup(${SWIG_MODULE_pyMITK_REAL_NAME} ${PYTHON_LIBRARIES})
 
 
 if(DEFINED SKBUILD)
   message(WARNING "SKBuild exists")
   # Currently this installation
   install(FILES
       ${CMAKE_CURRENT_BINARY_DIR}/pyMITK.py
       ${CMAKE_CURRENT_SOURCE_DIR}/Packaging/__init__.py
     #  ${MITK_DOC_FILES}
     DESTINATION pyMITK
     COMPONENT Runtime
     )
 
   install(TARGETS ${SWIG_MODULE_pyMITK_REAL_NAME}
     RUNTIME DESTINATION pyMITK
     LIBRARY DESTINATION pyMITK
     COMPONENT Runtime
     )
 else()
   message(WARNING "SKBuild missing")
   include(LegacyPackaging.cmake)
 endif()