diff --git a/CMakeExternals/Numpy.cmake b/CMakeExternals/Numpy.cmake
index 6138b0771d..1f461249cd 100644
--- a/CMakeExternals/Numpy.cmake
+++ b/CMakeExternals/Numpy.cmake
@@ -1,32 +1,40 @@
 
 if( MITK_USE_Python )
-  if( NOT Numpy_DIR )
+
+  # Sanity checks
+  if(DEFINED Numpy_DIR AND NOT EXISTS ${Numpy_DIR})
+    message(FATAL_ERROR "Numpy_DIR variable is defined but corresponds to non-existing directory")
+  endif()
+
+  if( NOT DEFINED Numpy_DIR )
     set(proj Numpy)
     set(proj_DEPENDENCIES )
     set(Numpy_DEPENDS ${proj})
 
     if(NOT MITK_USE_SYSTEM_PYTHON)
       list(APPEND proj_DEPENDENCIES Python)
     endif()
 
+    set(Numpy_URL "https://dl.dropboxusercontent.com/u/8367205/numpy-1.6.1.tar.gz")
+
     ExternalProject_Add(${proj}
-      URL "http://svn.slicer.org/Slicer3-lib-mirrors/trunk/numpy-1.4.1.tar.gz"
+      URL ${Numpy_URL}
       SOURCE_DIR ${proj}-src
       PREFIX ${proj}-cmake
       BUILD_IN_SOURCE 1
       INSTALL_DIR ${CMAKE_BINARY_DIR}/${proj}-install
       CONFIGURE_COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/${proj}-src/setup.py config
       BUILD_COMMAND   ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/${proj}-src/setup.py build
       INSTALL_COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/${proj}-src/setup.py install --prefix=${CMAKE_BINARY_DIR}/${proj}-install
 
       DEPENDS
         ${${proj}_DEPENDENCIES}
     )
 
    set(Numpy_DIR ${CMAKE_BINARY_DIR}/${proj}-install/lib/python2.7/site-packages)
 
    else()
      mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}")
    endif()
 endif()
 
diff --git a/CMakeExternals/OpenCV.cmake b/CMakeExternals/OpenCV.cmake
index 592c1a899b..0ad6fdf46b 100644
--- a/CMakeExternals/OpenCV.cmake
+++ b/CMakeExternals/OpenCV.cmake
@@ -1,97 +1,98 @@
 #-----------------------------------------------------------------------------
 # OpenCV
 #-----------------------------------------------------------------------------
 
 if(MITK_USE_OpenCV)
 
   # Sanity checks
   if(DEFINED OpenCV_DIR AND NOT EXISTS ${OpenCV_DIR})
     message(FATAL_ERROR "OpenCV_DIR variable is defined but corresponds to non-existing directory")
   endif()
 
   set(proj OpenCV)
   set(proj_DEPENDENCIES)
   set(OpenCV_DEPENDS ${proj})
 
   if(NOT DEFINED OpenCV_DIR)
 
     set(additional_cmake_args
       -DBUILD_opencv_java:BOOL=OFF
     )
 
     if(MITK_USE_Python)
       #message(STATUS "PYTHON_EXECUTABLE: ${PYTHON_EXECUTABLE}")
       #message(STATUS "PYTHON_DEBUG_LIBRARY: ${PYTHON_DEBUG_LIBRARY}")
       #message(STATUS "PYTHON_INCLUDE_DIR: ${PYTHON_INCLUDE_DIR}")
       #message(STATUS "PYTHON_LIBRARY: ${PYTHON_LIBRARY}")
       list(APPEND additional_cmake_args
          -DBUILD_opencv_python:BOOL=ON
          -DBUILD_NEW_PYTHON_SUPPORT:BOOL=ON
          -DPYTHON_DEBUG_LIBRARY:FILEPATH=${PYTHON_DEBUG_LIBRARY}
          -DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE}
          -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR}
          -DPYTHON_INCLUDE_DIR2:PATH=${PYTHON_INCLUDE_DIR2}
          -DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY}
+
          #-DPYTHON_LIBRARIES=${PYTHON_LIBRARY}
          #-DPYTHON_DEBUG_LIBRARIES=${PYTHON_DEBUG_LIBRARIES}
           )
         if(NOT MITK_USE_SYSTEM_PYTHON)
           list(APPEND proj_DEPENDENCIES Python Numpy)
 
-          set(env{PYTHONPATH} ${Numpy_DIR})
+          #set(env{PYTHONPATH} ${Numpy_DIR})
           list(APPEND additional_cmake_args
             -DPYTHON_NUMPY_INCLUDE_DIR:PATH=${Numpy_DIR}/numpy/core/include/numpy
               )
         endif()
     else()
       list(APPEND additional_cmake_args
          -DBUILD_opencv_python:BOOL=OFF
          -DBUILD_NEW_PYTHON_SUPPORT:BOOL=OFF
           )
     endif()
 
     # 12-05-02, muellerm, added QT usage by OpenCV if QT is used in MITK
     # 12-09-11, muellerm, removed automatic usage again, since this will struggle with the MITK Qt application object
     if(MITK_USE_QT)
       list(APPEND additional_cmake_args
            -DWITH_QT:BOOL=OFF
            -DWITH_QT_OPENGL:BOOL=OFF
            -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
           )
     endif()
 
     set(OpenCV_PATCH_COMMAND ${CMAKE_COMMAND} -DTEMPLATE_FILE:FILEPATH=${MITK_SOURCE_DIR}/CMakeExternals/EmptyFileForPatching.dummy -P ${MITK_SOURCE_DIR}/CMakeExternals/PatchOpenCV-2.4.8.2.cmake)
 
 
     set(opencv_url ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/OpenCV-2.4.8.2.tar.gz)
     set(opencv_url_md5 07fa7c1d225ea7fe8eeb1270a6b00e69)
 
     ExternalProject_Add(${proj}
       SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}-src
       BINARY_DIR ${proj}-build
       PREFIX ${proj}-cmake
       URL ${opencv_url}
       URL_MD5 ${opencv_url_md5}
       INSTALL_COMMAND ""
       PATCH_COMMAND ${OpenCV_PATCH_COMMAND}
       CMAKE_GENERATOR ${gen}
       CMAKE_ARGS
         ${ep_common_args}
         -DBUILD_DOCS:BOOL=OFF
         -DBUILD_TESTS:BOOL=OFF
         -DBUILD_EXAMPLES:BOOL=OFF
         -DBUILD_DOXYGEN_DOCS:BOOL=OFF
         -DWITH_CUDA:BOOL=ON
         ${additional_cmake_args}
       DEPENDS ${proj_DEPENDENCIES}
     )
 
     set(OpenCV_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build)
 
   else()
 
     mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}")
 
   endif()
 
 endif()
diff --git a/CMakeExternals/Python.cmake b/CMakeExternals/Python.cmake
index 092c447845..ca87a18672 100644
--- a/CMakeExternals/Python.cmake
+++ b/CMakeExternals/Python.cmake
@@ -1,143 +1,149 @@
 if( MITK_USE_Python AND NOT MITK_USE_SYSTEM_PYTHON )
- if(NOT DEFINED Python_DIR)
-  set(proj Python)
-  set(proj_DEPENDENCIES )
-  set(Python_DEPENDS ${proj})
 
-  set(PYTHON_MAJOR_VERSION 2)
-  set(PYTHON_MINOR_VERSION 7)
-  set(PYTHON_PATCH_VERSION 3)
+    # Sanity checks
+  if(DEFINED Python_DIR AND NOT EXISTS ${Python_DIR})
+    message(FATAL_ERROR "Python_DIR variable is defined but corresponds to non-existing directory")
+  endif()
 
-  set(PYTHON_SOURCE_PACKAGE Python-${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}.${PYTHON_PATCH_VERSION})
+  if(NOT DEFINED Python_DIR)
+    set(proj Python)
+    set(proj_DEPENDENCIES )
+    set(Python_DEPENDS ${proj})
 
-  # download the source code
-  ExternalProject_Add(Python-src
-    URL "https://www.python.org/ftp/python/${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}.${PYTHON_PATCH_VERSION}/${PYTHON_SOURCE_PACKAGE}.tgz"
-    #URL_MD5 "d41d8cd98f00b204e9800998ecf8427e"
-    #DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}
-    PREFIX   ${CMAKE_BINARY_DIR}/${PYTHON_SOURCE_PACKAGE}-cmake
-    SOURCE_DIR  "${CMAKE_BINARY_DIR}/${PYTHON_SOURCE_PACKAGE}"
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
-    INSTALL_COMMAND ""
-  )
+    set(PYTHON_MAJOR_VERSION 2)
+    set(PYTHON_MINOR_VERSION 7)
+    set(PYTHON_PATCH_VERSION 3)
 
-  set(additional_cmake_cache_args )
-  list(APPEND additional_cmake_cache_args
-      -DBUILTIN_ARRAY:BOOL=ON
-      -DBUILTIN_AUDIOOP:BOOL=ON
-      -DBUILTIN_BINASCII:BOOL=ON
-      -DBUILTIN_BISECT:BOOL=ON
-      -DBUILTIN_BSDB:BOOL=ON
-      -DBUILTIN_BSSDB:BOOL=ON
-      -DBUILTIN_BZ2:BOOL=ON
-      -DBUILTIN_CMATH:BOOL=ON
-      -DBUILTIN_COLLECTIONS:BOOL=ON
-      -DBUILTIN_CODECS_CN:BOOL=ON
-      -DBUILTIN_CODECS_HK:BOOL=ON
-      -DBUILTIN_CODECS_ISO2022:BOOL=ON
-      -DBUILTIN_CODECS_JP:BOOL=ON
-      -DBUILTIN_CODECS_KR:BOOL=ON
-      -DBUILTIN_CODECS_TW:BOOL=ON
-      -DBUILTIN_CPICKLE:BOOL=ON
-      -DBUILTIN_CRYPT:BOOL=ON
-      -DBUILTIN_CSTRINGIO:BOOL=ON
-      -DBUILTIN_CSV:BOOL=ON
-      -DBUILTIN_CTYPES:BOOL=OFF
-      #-DBUILTIN_CTYPES_TEST:BOOL=OFF
-      #-DBUILTIN_CURSES:BOOL=ON
-      -DBUILTIN_DATETIME:BOOL=ON
-      -DBUILTIN_DBM:BOOL=ON
-      -DBUILTIN_ELEMENTTREE:BOOL=ON
-      -DBUILTIN_FCNTL:BOOL=ON
-      -DBUILTIN_FUNCTOOLS:BOOL=ON
-      -DBUILTIN_FUTURE_BUILTINS:BOOL=ON
-      -DBULTIN_GDBM:BOOL=ON
-      -DBUILTIN_GRP:BOOL=ON
-      -DBUILTIN_HASHLIB:BOOL=ON
-      -DBUILTIN_HEAPQ:BOOL=ON
-      -DBUILTIN_HOTSHOT:BOOL=ON
-      -DBUILTIN_IO:BOOL=ON
-      -DBUILTIN_ITERTOOLS:BOOL=ON
-      -DBUILTIN_JSON:BOOL=ON
-      -DBUILTIN_LOCALE:BOOL=ON
-      -DBUILTIN_LSPROF:BOOL=ON
-      -DBUILTIN_MATH:BOOL=ON
-      -DBUILTIN_MMAP:BOOL=ON
-      -DBUILTIN_MULTIBYTECODEC:BOOL=ON
-      -DBUILTIN_MD5:BOOL=ON
-      -DBUILTIN_MULTIPROCESSING:BOOL=ON
-      -DBUILTIN_NIS:BOOL=ON
-      -DBUILTIN_NIT:BOOL=ON
-      -DBUILTIN_OPERATOR:BOOL=ON
-      -DBUILTIN_PARSER:BOOL=ON
-      -DBUILTIN_POSIX:BOOL=ON
-      -DBUILTIN_PWD:BOOL=ON
-      -DBUILTIN_PYEXPAT:BOOL=ON
-      -DBUILTIN_READLINE:BOOL=ON
-      -DBUILTIN_RESOURCE:BOOL=ON
-      -DBULTIN_RANDOM:BOOL=ON
-      -DBUILTIN_SCPROXY:BOOL=ON
-      -DBUILTIN_SELECT:BOOL=ON
-      -DBUILTIN_SHA:BOOL=ON
-      -DBUILTIN_SHA256:BOOL=ON
-      -DBUILTIN_SHA512:BOOL=ON
-      -DBUILTIN_SOCKET:BOOL=ON
-      -DBUILTIN_SPWD:BOOL=ON
-      -DBUILTIN_SQLITE3:BOOL=ON
-      -DBUILTIN_SSL:BOOL=ON
-      -DBUILTIN_STROP:BOOL=ON
-      -DBUILTIN_STRUCT:BOOL=ON
-      -DBUILTIN_SUBPROCESS:BOOL=ON
-      -DBUILTIN_SYSLOG:BOOL=ON
-      -DBUILTIN_TERMIOS:BOOL=ON
-      #-DBUILTIN_TESTCAPI:BOOL=OFF
-      -DBUILTIN_TIME:BOOL=ON
-      -DBUILTIN_TKINTER:BOOL=ON
-      -DBUILTIN_UNICODEDATA:BOOL=ON
-      -DBUILTIN_WINREG:BOOL=ON
-      -DBUILTIN_ZLIB:BOOL=ON
-      )
+    set(PYTHON_SOURCE_PACKAGE Python-${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}.${PYTHON_PATCH_VERSION})
 
-  # CMake build environment for python
-  ExternalProject_Add(${proj}
-    GIT_REPOSITORY "git://github.com/davidsansome/python-cmake-buildsystem.git"
-    GIT_TAG "3c5864f210a8d0ae1196be7c691252e16e459f59"
-    SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}-src
-    PREFIX ${proj}-cmake
-    BINARY_DIR ${proj}-build
-    INSTALL_DIR ${proj}-install
-    CMAKE_ARGS
-      ${ep_common_args}
-      -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-    CMAKE_CACHE_ARGS
-      -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
-      -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
-      #-DBUILD_TESTING:BOOL=OFF
-      -DBUILD_SHARED:BOOL=ON
-      -DBUILD_STATIC:BOOL=OFF
-      -DUSE_SYSTEM_LIBRARIES:BOOL=ON
-      ${additional_cmake_cache_args}
-    DEPENDS
-      Python-src ${${proj}_DEPENDENCIES}
-  )
+    # download the source code
+    ExternalProject_Add(Python-src
+      URL "https://www.python.org/ftp/python/${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}.${PYTHON_PATCH_VERSION}/${PYTHON_SOURCE_PACKAGE}.tgz"
+      #URL_MD5 "d41d8cd98f00b204e9800998ecf8427e"
+      #DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}
+      PREFIX   ${CMAKE_BINARY_DIR}/${PYTHON_SOURCE_PACKAGE}-cmake
+      SOURCE_DIR  "${CMAKE_BINARY_DIR}/${PYTHON_SOURCE_PACKAGE}"
+      CONFIGURE_COMMAND ""
+      BUILD_COMMAND ""
+      INSTALL_COMMAND ""
+    )
 
-  set(Python_DIR "${CMAKE_BINARY_DIR}/${proj}-install")
-  if(UNIX)
-    set(PYTHON_EXECUTABLE "${CMAKE_BINARY_DIR}/${proj}-build/bin/python${CMAKE_EXECUTABLE_SUFFIX}")
-    set(PYTHON_INCLUDE_DIR "${Python_DIR}/include/python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}")
-    set(PYTHON_LIBRARY "${CMAKE_BINARY_DIR}/${proj}-build/lib/${CMAKE_SHARED_LIBRARY_PREFIX}python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-  else(WIN32)
-    set(PYTHON_EXECUTABLE "${Python_DIR}/bin/python${CMAKE_EXECUTABLE_SUFFIX}")
-    set(PYTHON_INCLUDE_DIR "${Python_DIR}/include")
-    set(PYTHON_LIBRARY "${Python_DIR}/libs/python${PYTHON_MAJOR_VERSION}${PYTHON_MINOR_VERSION}.lib")
-  endif()
+    set(additional_cmake_cache_args )
+    list(APPEND additional_cmake_cache_args
+        -DBUILTIN_ARRAY:BOOL=ON
+        -DBUILTIN_AUDIOOP:BOOL=ON
+        -DBUILTIN_BINASCII:BOOL=ON
+        -DBUILTIN_BISECT:BOOL=ON
+        -DBUILTIN_BSDB:BOOL=ON
+        -DBUILTIN_BSSDB:BOOL=ON
+        -DBUILTIN_BZ2:BOOL=ON
+        -DBUILTIN_CMATH:BOOL=ON
+        -DBUILTIN_COLLECTIONS:BOOL=ON
+        -DBUILTIN_CODECS_CN:BOOL=ON
+        -DBUILTIN_CODECS_HK:BOOL=ON
+        -DBUILTIN_CODECS_ISO2022:BOOL=ON
+        -DBUILTIN_CODECS_JP:BOOL=ON
+        -DBUILTIN_CODECS_KR:BOOL=ON
+        -DBUILTIN_CODECS_TW:BOOL=ON
+        -DBUILTIN_CPICKLE:BOOL=ON
+        -DBUILTIN_CRYPT:BOOL=ON
+        -DBUILTIN_CSTRINGIO:BOOL=ON
+        -DBUILTIN_CSV:BOOL=ON
+        -DBUILTIN_CTYPES:BOOL=OFF
+        #-DBUILTIN_CTYPES_TEST:BOOL=OFF
+        #-DBUILTIN_CURSES:BOOL=ON
+        -DBUILTIN_DATETIME:BOOL=ON
+        -DBUILTIN_DBM:BOOL=ON
+        -DBUILTIN_ELEMENTTREE:BOOL=ON
+        -DBUILTIN_FCNTL:BOOL=ON
+        -DBUILTIN_FUNCTOOLS:BOOL=ON
+        -DBUILTIN_FUTURE_BUILTINS:BOOL=ON
+        -DBULTIN_GDBM:BOOL=ON
+        -DBUILTIN_GRP:BOOL=ON
+        -DBUILTIN_HASHLIB:BOOL=ON
+        -DBUILTIN_HEAPQ:BOOL=ON
+        -DBUILTIN_HOTSHOT:BOOL=ON
+        -DBUILTIN_IO:BOOL=ON
+        -DBUILTIN_ITERTOOLS:BOOL=ON
+        -DBUILTIN_JSON:BOOL=ON
+        -DBUILTIN_LOCALE:BOOL=ON
+        -DBUILTIN_LSPROF:BOOL=ON
+        -DBUILTIN_MATH:BOOL=ON
+        -DBUILTIN_MMAP:BOOL=ON
+        -DBUILTIN_MULTIBYTECODEC:BOOL=ON
+        -DBUILTIN_MD5:BOOL=ON
+        -DBUILTIN_MULTIPROCESSING:BOOL=ON
+        -DBUILTIN_NIS:BOOL=ON
+        -DBUILTIN_NIT:BOOL=ON
+        -DBUILTIN_OPERATOR:BOOL=ON
+        -DBUILTIN_PARSER:BOOL=ON
+        -DBUILTIN_POSIX:BOOL=ON
+        -DBUILTIN_PWD:BOOL=ON
+        -DBUILTIN_PYEXPAT:BOOL=ON
+        -DBUILTIN_READLINE:BOOL=ON
+        -DBUILTIN_RESOURCE:BOOL=ON
+        -DBULTIN_RANDOM:BOOL=ON
+        -DBUILTIN_SCPROXY:BOOL=ON
+        -DBUILTIN_SELECT:BOOL=ON
+        -DBUILTIN_SHA:BOOL=ON
+        -DBUILTIN_SHA256:BOOL=ON
+        -DBUILTIN_SHA512:BOOL=ON
+        -DBUILTIN_SOCKET:BOOL=ON
+        -DBUILTIN_SPWD:BOOL=ON
+        -DBUILTIN_SQLITE3:BOOL=ON
+        -DBUILTIN_SSL:BOOL=ON
+        -DBUILTIN_STROP:BOOL=ON
+        -DBUILTIN_STRUCT:BOOL=ON
+        -DBUILTIN_SUBPROCESS:BOOL=ON
+        -DBUILTIN_SYSLOG:BOOL=ON
+        -DBUILTIN_TERMIOS:BOOL=ON
+        #-DBUILTIN_TESTCAPI:BOOL=OFF
+        -DBUILTIN_TIME:BOOL=ON
+        -DBUILTIN_TKINTER:BOOL=ON
+        -DBUILTIN_UNICODEDATA:BOOL=ON
+        -DBUILTIN_WINREG:BOOL=ON
+        -DBUILTIN_ZLIB:BOOL=ON
+        )
+
+    # CMake build environment for python
+    ExternalProject_Add(${proj}
+      GIT_REPOSITORY "git://github.com/davidsansome/python-cmake-buildsystem.git"
+      GIT_TAG "3c5864f210a8d0ae1196be7c691252e16e459f59"
+      SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}-src
+      PREFIX ${proj}-cmake
+      BINARY_DIR ${proj}-build
+      INSTALL_DIR ${proj}-install
+      CMAKE_ARGS
+        ${ep_common_args}
+        -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+      CMAKE_CACHE_ARGS
+        -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
+        -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
+        #-DBUILD_TESTING:BOOL=OFF
+        -DBUILD_SHARED:BOOL=ON
+        -DBUILD_STATIC:BOOL=OFF
+        -DUSE_SYSTEM_LIBRARIES:BOOL=ON
+        ${additional_cmake_cache_args}
+      DEPENDS
+        Python-src ${${proj}_DEPENDENCIES}
+    )
 
-  # get the name of the library
-  get_filename_component(PYTHON_LIBRARY_NAME "${PYTHON_LIBRARY}" NAME)
+    set(Python_DIR "${CMAKE_BINARY_DIR}/${proj}-install")
+    if(UNIX)
+      set(PYTHON_EXECUTABLE "${CMAKE_BINARY_DIR}/${proj}-build/bin/python${CMAKE_EXECUTABLE_SUFFIX}")
+      set(PYTHON_INCLUDE_DIR "${Python_DIR}/include/python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}")
+      set(PYTHON_LIBRARY "${CMAKE_BINARY_DIR}/${proj}-build/lib/${CMAKE_SHARED_LIBRARY_PREFIX}python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+    else(WIN32)
+      set(PYTHON_EXECUTABLE "${Python_DIR}/bin/python${CMAKE_EXECUTABLE_SUFFIX}")
+      set(PYTHON_INCLUDE_DIR "${Python_DIR}/include")
+      set(PYTHON_LIBRARY "${Python_DIR}/libs/python${PYTHON_MAJOR_VERSION}${PYTHON_MINOR_VERSION}.lib")
+    endif()
 
- else()
-  mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}")
- endif()
+    # get the name of the library
+    get_filename_component(PYTHON_LIBRARY_NAME "${PYTHON_LIBRARY}" NAME)
+
+  else()
+    mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}")
+  endif()
 endif()
 
diff --git a/CMakeExternals/SimpleITK.cmake b/CMakeExternals/SimpleITK.cmake
index 1e27334872..cc0bfaa8d7 100644
--- a/CMakeExternals/SimpleITK.cmake
+++ b/CMakeExternals/SimpleITK.cmake
@@ -1,89 +1,89 @@
 #-----------------------------------------------------------------------------
 # SimpleITK
 #-----------------------------------------------------------------------------
 
 if(MITK_USE_SimpleITK)
 
-  # Sanity checks
-  if(DEFINED SimpleITK_DIR AND NOT EXISTS ${SimpleITK_DIR})
-    message(FATAL_ERROR "SimpleITK_DIR variable is defined but corresponds to non-existing directory")
-  endif()
+ # Sanity checks
+ if(DEFINED SimpleITK_DIR AND NOT EXISTS ${SimpleITK_DIR})
+   message(FATAL_ERROR "SimpleITK_DIR variable is defined but corresponds to non-existing directory")
+ endif()
 
   set(proj SimpleITK)
   set(proj_DEPENDENCIES ITK GDCM Swig)
 
   if(MITK_USE_OpenCV)
     list(APPEND proj_DEPENDENCIES OpenCV)
   endif()
 
   if(NOT MITK_USE_SYSTEM_PYTHON)
     list(APPEND proj_DEPENDENCIES Python)
   endif()
 
   set(SimpleITK_DEPENDS ${proj})
 
   if(NOT DEFINED SimpleITK_DIR)
 
     set(additional_cmake_args )
 
     list(APPEND additional_cmake_args
          -DWRAP_CSHARP:BOOL=OFF
          -DWRAP_TCL:BOOL=OFF
          -DWRAP_LUA:BOOL=OFF
          -DWRAP_PYTHON:BOOL=OFF
         )
 
     if(MITK_USE_Python)
       list(APPEND additional_cmake_args
         -DWRAP_PYTHON:BOOL=ON
           )
     endif(MITK_USE_Python)
 
     if(MITK_USE_OpenCV)
       list(APPEND additional_cmake_args
            -DOpenCV_DIR:PATH=${OpenCV_DIR}
           )
     endif()
 
     set(SimpleITK_PATCH_COMMAND ${CMAKE_COMMAND} -DTEMPLATE_FILE:FILEPATH=${MITK_SOURCE_DIR}/CMakeExternals/EmptyFileForPatching.dummy -P ${MITK_SOURCE_DIR}/CMakeExternals/PatchSimpleITK.cmake)
 
     ExternalProject_Add(${proj}
        SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}-src
        BINARY_DIR ${proj}-build
        PREFIX ${proj}-cmake
        GIT_REPOSITORY "http://itk.org/SimpleITK.git"
        GIT_TAG "493f15f5cfc620413d0aa7bb705ffe6d038a41b5"
        #INSTALL_COMMAND ""
        INSTALL_DIR ${proj}-install
        PATCH_COMMAND ${SimpleITK_PATCH_COMMAND}
        CMAKE_ARGS
          ${ep_common_args}
          -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
        CMAKE_CACHE_ARGS
          ${additional_cmake_args}
          -DSimpleITK_BUILD_DISTRIBUTE:BOOL=ON
          -DSimpleITK_PYTHON_THREADS:BOOL=ON
          -DUSE_SYSTEM_ITK:BOOL=ON
          -DBUILD_TESTING:BOOL=OFF
          -DBUILD_EXAMPLES:BOOL=OFF
          -DGDCM_DIR:PATH=${GDCM_DIR}
          -DITK_DIR:PATH=${ITK_DIR}
          -DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE}
          -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR}
          -DPYTHON_INCLUDE_DIR2:PATH=${PYTHON_INCLUDE_DIR2}
          -DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY}
          -DSWIG_DIR:PATH=${SWIG_DIR}
          -DSWIG_EXECUTABLE:FILEPATH=${SWIG_EXECUTABLE}
        DEPENDS ${proj_DEPENDENCIES}
       )
 
     set(SimpleITK_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build)
 
   else()
 
     mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}")
 
   endif()
 
 endif()