diff --git a/BlueBerry/CMakeLists.txt b/BlueBerry/CMakeLists.txt
index ab3b06adad..4be3b99ef6 100644
--- a/BlueBerry/CMakeLists.txt
+++ b/BlueBerry/CMakeLists.txt
@@ -1,272 +1,276 @@
 project(BlueBerry)
 cmake_minimum_required(VERSION 2.8.4)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/CMake/")
 
 include(MacroParseArguments)
 include(MacroConvertSchema)
 include(MacroOrganizeSources)
 include(MacroCreateCTKPlugin)
 include(MacroCreateQtHelp)
 include(MacroInstallCTKPlugin)
 include(FunctionCreateProvisioningFile)
 
 if(MSVC)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250 /wd4275 /wd4251 /wd4503")
 endif()
 
 if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 endif()
 
 find_package(mbilog REQUIRED)
 include_directories(${mbilog_INCLUDE_DIRS})
 
 
 find_package(Qt4 4.6.2 REQUIRED)
 
 if(QT_QMAKE_CHANGED)
   set(QT_HELPGENERATOR_EXECUTABLE NOTFOUND)
   set(QT_COLLECTIONGENERATOR_EXECUTABLE NOTFOUND)
   set(QT_ASSISTANT_EXECUTABLE NOTFOUND)
   set(QT_XMLPATTERNS_EXECUTABLE NOTFOUND)
 endif()
 
 find_program(QT_HELPGENERATOR_EXECUTABLE
   NAMES qhelpgenerator qhelpgenerator-qt4 qhelpgenerator4
   PATHS ${QT_BINARY_DIR}
   NO_DEFAULT_PATH
 )
 
 find_program(QT_COLLECTIONGENERATOR_EXECUTABLE
   NAMES qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator4
   PATHS ${QT_BINARY_DIR}
   NO_DEFAULT_PATH
 )
 
 find_program(QT_ASSISTANT_EXECUTABLE
   NAMES assistant-qt4 assistant4 assistant
   PATHS ${QT_BINARY_DIR}
   NO_DEFAULT_PATH
 )
 
 find_program(QT_XMLPATTERNS_EXECUTABLE
   NAMES xmlpatterns
   PATHS ${QT_BINARY_DIR}
   NO_DEFAULT_PATH
 )
 
 option(BLUEBERRY_USE_QT_HELP "Enable support for integrating bundle documentation into Qt Help" ON)
 
 mark_as_advanced(BLUEBERRY_USE_QT_HELP
                  QT_HELPGENERATOR_EXECUTABLE
                  QT_COLLECTIONGENERATOR_EXECUTABLE
                  QT_ASSISTANT_EXECUTABLE
                  QT_XMLPATTERNS_EXECUTABLE)
 
 set(_doxygen_too_old 1)
 if(BLUEBERRY_USE_QT_HELP)
   find_package(Doxygen)
   if(DOXYGEN_FOUND)
     execute_process(COMMAND ${DOXYGEN_EXECUTABLE} --version
                     OUTPUT_VARIABLE _doxygen_version)
     if(${_doxygen_version} VERSION_GREATER 1.6.0 OR
        ${_doxygen_version} VERSION_EQUAL 1.6.0)
       set(_doxygen_too_old 0)
     endif()
   endif()
 
   if(_doxygen_too_old)
     message("Doxygen was not found or is too old. Version 1.6.0 or later is needed if BLUEBERRY_USE_QT_HELP is ON")
     set(BLUEBERRY_USE_QT_HELP OFF CACHE BOOL "Enable support for integrating bundle documentation into Qt Help" FORCE)
   endif()
 
   if(NOT QT_HELPGENERATOR_EXECUTABLE)
     message("You have enabled Qt Help support, but QT_HELPGENERATOR_EXECUTABLE is empty")
     set(BLUEBERRY_USE_QT_HELP OFF CACHE BOOL "Enable support for integrating bundle documentation into Qt Help" FORCE)
   endif()
 
   if(NOT QT_XMLPATTERNS_EXECUTABLE)
     message("You have enabled Qt Help support, but QT_XMLPATTERNS_EXECUTABLE is empty")
     set(BLUEBERRY_USE_QT_HELP OFF CACHE BOOL "Enable support for integrating bundle documentation into Qt Help" FORCE)
   endif()
 endif(BLUEBERRY_USE_QT_HELP)
 
 include(${QT_USE_FILE})
 
 # =========  CTK specific CMake stuff ============
 cmake_policy(SET CMP0012 NEW)
 
 find_package(CTK REQUIRED)
 
 # Extract all library names starting with org_blueberry_
 macro(GetMyTargetLibraries all_target_libraries varname)
   set(re_ctkplugin "^org_blueberry_[a-zA-Z0-9_]+$")
   set(_tmp_list)
   list(APPEND _tmp_list ${all_target_libraries})
   ctkMacroListFilter(_tmp_list re_ctkplugin OUTPUT_VARIABLE ${varname})
 endmacro()
 # ================================================
 
 option(BLUEBERRY_BUILD_ALL_PLUGINS "Build all BlueBerry plugins (overriding selection)" OFF)
 mark_as_advanced(BLUEBERRY_BUILD_ALL_PLUGINS)
 
 if(BLUEBERRY_BUILD_ALL_PLUGINS)
   set(BLUEBERRY_BUILD_ALL_PLUGINS_OPTION "FORCE_BUILD_ALL")
 endif()
 
 option(BLUEBERRY_STATIC "Build all plugins as static libraries" OFF)
 mark_as_advanced(BLUEBERRY_STATIC)
 
 option(BLUEBERRY_DEBUG_SMARTPOINTER "Enable code for debugging smart pointers" OFF)
 mark_as_advanced(BLUEBERRY_DEBUG_SMARTPOINTER)
 
 find_package(Poco REQUIRED)
 find_package(Ant)
 find_package(Eclipse)
 
 set(BLUEBERRY_SOURCE_DIR ${BlueBerry_SOURCE_DIR})
 set(BLUEBERRY_BINARY_DIR ${BlueBerry_BINARY_DIR})
 
 set(BLUEBERRY_PLUGINS_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Bundles)
 set(BLUEBERRY_PLUGINS_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/Bundles)
 
 set(OSGI_APP solstice)
 set(OSGI_UI_APP solstice_ui)
 
 if(Eclipse_DIR)
   set(BLUEBERRY_DOC_TOOLS_DIR "${Eclipse_DIR}" CACHE PATH "Directory containing additional tools needed for generating the documentation")
 else()
   set(BLUEBERRY_DOC_TOOLS_DIR "" CACHE PATH "Directory containing additional tools needed for generating the documentation")
 endif()
 
 set(BLUEBERRY_DEBUG_POSTFIX d)
 
 # Testing options
 
-option(BLUEBERRY_BUILD_TESTING "Build the BlueBerry tests." ${BUILD_TESTING})
+if(DEFINED BLUEBERRY_BUILD_TESTING)
+  option(BLUEBERRY_BUILD_TESTING "Build the BlueBerry tests." ${BLUEBERRY_BUILD_TESTING})
+else()
+  option(BLUEBERRY_BUILD_TESTING "Build the BlueBerry tests." ${BUILD_TESTING})
+endif()
 
 if(WIN32)
   set(_gui_testing_default "ON")
 else()
   set(_gui_testing_default "OFF")
 endif()
 
 option(BLUEBERRY_ENABLE_GUI_TESTING "Enable the BlueBerry GUI tests" ${_gui_testing_default})
 mark_as_advanced(BLUEBERRY_ENABLE_GUI_TESTING)
 
 if(BLUEBERRY_BUILD_TESTING)
   enable_testing()
 endif()
 
 
 # Add CTK plugins
 
 set(_ctk_plugins
   Bundles/org.blueberry.osgi:ON
   Bundles/org.blueberry.compat:OFF
   Bundles/org.blueberry.core.runtime:OFF
   Bundles/org.blueberry.core.expressions:OFF
   Bundles/org.blueberry.solstice.common:OFF
   Bundles/org.blueberry.core.commands:OFF
   Bundles/org.blueberry.core.jobs:OFF
   Bundles/org.blueberry.ui:OFF
   Bundles/org.blueberry.ui.qt:OFF
   Bundles/org.blueberry.ui.qt.help:OFF
   Bundles/org.blueberry.ui.qt.log:OFF
   Bundles/org.blueberry.ui.qt.objectinspector:OFF
 )
 
 set(_ctk_test_plugins )
 
 set(_ctk_plugins_include_dirs
   ${Poco_INCLUDE_DIRS}
 )
 
 set(_ctk_plugins_link_dirs
   ${Poco_LIBRARY_DIR}
 )
 
 include_directories(${_ctk_plugins_include_dirs})
 link_directories(${_ctk_plugins_link_dirs})
 
 if(BLUEBERRY_BUILD_TESTING)
   include(berryTestingHelpers)
 
   set(BLUEBERRY_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_APP}")
   get_target_property(_is_macosx_bundle ${OSGI_APP} MACOSX_BUNDLE)
   if(APPLE AND _is_macosx_bundle) 
     set(BLUEBERRY_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_APP}.app/Contents/MacOS/${OSGI_APP}")
   endif()
 
   set(_ctk_testinfrastructure_plugins
     Bundles/org.blueberry.test:ON
     Bundles/org.blueberry.uitest:ON
   )
 
   set(_ctk_test_plugins
 #    Testing/org.blueberry.core.runtime.tests:ON
 #    Testing/org.blueberry.osgi.tests:ON
   )
   
   if(BLUEBERRY_ENABLE_GUI_TESTING)
 #    list(APPEND _ctk_test_plugins Testing/org.blueberry.ui.tests:ON)
 
     set(BLUEBERRY_UI_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_UI_APP}")
     get_target_property(_is_macosx_bundle ${OSGI_UI_APP} MACOSX_BUNDLE)
     if(APPLE AND _is_macosx_bundle)
       set(BLUEBERRY_UI_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_UI_APP}.app/Contents/MacOS/${OSGI_UI_APP}")
     endif()
   endif()
 endif()
 
 set(BLUEBERRY_TESTING_PROVISIONING_FILE "${BlueBerry_BINARY_DIR}/BlueBerryTesting.provisioning")
 
 add_custom_target(BlueBerry)
 
 ctkMacroSetupPlugins(${_ctk_plugins} ${_ctk_testinfrastructure_plugins} ${_ctk_test_plugins}
                      BUILD_OPTION_PREFIX BLUEBERRY_BUILD_
                      BUILD_ALL ${BLUEBERRY_BUILD_ALL_PLUGINS}
                      COMPACT_OPTIONS)
 
 set(BLUEBERRY_PROVISIONING_FILE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/BlueBerry.provisioning")
 FunctionCreateProvisioningFile(
   FILE ${BLUEBERRY_PROVISIONING_FILE}
   PLUGINS ${_ctk_plugins}
 )
 
 FunctionCreateProvisioningFile(
   FILE ${BLUEBERRY_TESTING_PROVISIONING_FILE}
   INCLUDE ${BLUEBERRY_PROVISIONING_FILE}
   PLUGINS ${_ctk_testinfrastructure_plugins} ${_ctk_test_plugins}
 )
 
 if(${CMAKE_PROJECT_NAME}_PLUGIN_LIBRARIES)
   add_dependencies(BlueBerry ${${CMAKE_PROJECT_NAME}_PLUGIN_LIBRARIES})
 endif()
 set_property(TARGET ${${CMAKE_PROJECT_NAME}_PLUGIN_LIBRARIES} PROPERTY LABELS BlueBerry)
 
 set(BB_PLUGIN_USE_FILE "${BlueBerry_BINARY_DIR}/BlueBerryPluginUseFile.cmake")
 if(${PROJECT_NAME}_PLUGIN_LIBRARIES)
   ctkFunctionGeneratePluginUseFile(${BB_PLUGIN_USE_FILE})
 else()
   file(REMOVE ${BB_PLUGIN_USE_FILE})
   set(BB_PLUGIN_USE_FILE )
 endif()
 
 # CTK Plugin Exports
 set(BB_PLUGIN_EXPORTS_FILE "${CMAKE_CURRENT_BINARY_DIR}/BlueBerryPluginExports.cmake")
 GetMyTargetLibraries("${${PROJECT_NAME}_PLUGIN_LIBRARIES}" my_plugin_targets)
 set(additional_export_targets mbilog PocoFoundation PocoUtil PocoXML)
 if(BLUEBERRY_BUILD_TESTING)
   list(APPEND additional_export_targets CppUnit)
 endif()
 export(TARGETS ${my_plugin_targets} ${additional_export_targets}
        FILE ${BB_PLUGIN_EXPORTS_FILE})
 
 
 add_subdirectory(Documentation)
 
 configure_file(BlueBerryConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/BlueBerryConfig.cmake @ONLY)
 
 
diff --git a/CMake/MITKDashboardSetup.cmake b/CMake/MITKDashboardSetup.cmake
index 814e87bdfd..aa6fe9b405 100644
--- a/CMake/MITKDashboardSetup.cmake
+++ b/CMake/MITKDashboardSetup.cmake
@@ -1,125 +1,136 @@
 # This file is intended to be included at the end of a custom MITKDashboardScript.TEMPLATE.cmake file
 
 list(APPEND CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 
 #
 # Automatically determined properties
 #
 set(MY_OPERATING_SYSTEM "${CMAKE_HOST_SYSTEM}") # Windows 7, Linux-2.6.32, Darwin... 
 site_name(CTEST_SITE)
 
 if(QT_BINARY_DIR)
   set(QT_QMAKE_EXECUTABLE "${QT_BINARY_DIR}/qmake")
 else()
   set(QT_QMAKE_EXECUTABLE "qmake")
 endif()
 
 execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} --version
                 OUTPUT_VARIABLE MY_QT_VERSION
                 RESULT_VARIABLE qmake_error)
 if(qmake_error)
   message(FATAL_ERROR "Error when executing ${QT_QMAKE_EXECUTABLE} --version\n${qmake_error}")
 endif()
 
 string(REGEX REPLACE ".*Qt version ([0-9.]+) .*" "\\1" MY_QT_VERSION ${MY_QT_VERSION})
 
 #
 # Project specific properties
 #
 if(NOT CTEST_BUILD_NAME)
   set(CTEST_BUILD_NAME "${MY_OPERATING_SYSTEM}-${MY_COMPILER}-Qt-${MY_QT_VERSION}-${CTEST_BUILD_CONFIGURATION}")
 endif()
 set(PROJECT_BUILD_DIR "MITK-build")
 
 set(CTEST_PATH "$ENV{PATH}")
 if(WIN32)
   set(VTK_BINARY_DIR "${CTEST_BINARY_DIRECTORY}/VTK-build/bin/${CTEST_BUILD_CONFIGURATION}")
   set(ITK_BINARY_DIR "${CTEST_BINARY_DIRECTORY}/ITK-build/bin/${CTEST_BUILD_CONFIGURATION}")
   set(BOOST_BINARY_DIR "${CTEST_BINARY_DIRECTORY}/Boost-src/stage/lib")
   set(GDCM_BINARY_DIR "${CTEST_BINARY_DIRECTORY}/GDCM-build/bin/${CTEST_BUILD_CONFIGURATION}")
   set(OPENCV_BINARY_DIR "${CTEST_BINARY_DIRECTORY}/OpenCV-build/bin/${CTEST_BUILD_CONFIGURATION}")
   set(BLUEBERRY_OSGI_DIR "${CTEST_BINARY_DIRECTORY}/MITK-build/bin/BlueBerry/org.blueberry.osgi/bin/${CTEST_BUILD_CONFIGURATION}")
   set(CTEST_PATH "${CTEST_PATH};${QT_BINARY_DIR};${VTK_BINARY_DIR};${ITK_BINARY_DIR};${BOOST_BINARY_DIR};${GDCM_BINARY_DIR};${OPENCV_BINARY_DIR};${BLUEBERRY_OSGI_DIR}")
 endif()
 set(ENV{PATH} "${CTEST_PATH}")
 
 set(SUPERBUILD_TARGETS "")
 
 # If the dashscript doesn't define a GIT_REPOSITORY variable, let's define it here.
 if(NOT DEFINED GIT_REPOSITORY OR GIT_REPOSITORY STREQUAL "")
   set(GIT_REPOSITORY "http://git.mitk.org/MITK.git")
 endif()
 
 #
 # Display build info
 #
 message("Site name: ${CTEST_SITE}")
 message("Build name: ${CTEST_BUILD_NAME}")
 message("Script Mode: ${SCRIPT_MODE}")
 message("Coverage: ${WITH_COVERAGE}, MemCheck: ${WITH_MEMCHECK}")
 
 #
 # Set initial cache options
 #
 if(CMAKE_GENERATOR MATCHES "[Mm]ake")
   set(CTEST_USE_LAUNCHERS 1)
 else()
   set(CTEST_USE_LAUNCHERS 0)
 endif()
 
 # Remove this if block after all dartclients work
 if(DEFINED ADDITIONNAL_CMAKECACHE_OPTION)
   message(WARNING "Rename ADDITIONNAL to ADDITIONAL in your dartlclient script: ${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
   set(ADDITIONAL_CMAKECACHE_OPTION ${ADDITIONNAL_CMAKECACHE_OPTION})
 endif()
 
 if(NOT DEFINED MITK_USE_Boost)
   set(MITK_USE_Boost 1)
 endif()
 
 if(NOT DEFINED MITK_USE_OpenCV)
   set(MITK_USE_OpenCV 1)
 endif()
 
 if(NOT DEFINED MITK_BUILD_ALL_APPS)
   set(MITK_BUILD_ALL_APPS TRUE)
 endif()
 
+if(NOT DEFINED BLUEBERRY_BUILD_ALL_PLUGINS)
+  set(BLUEBERRY_BUILD_ALL_PLUGINS TRUE)
+endif()
+
+if(NOT DEFINED MITK_BUILD_ALL_PLUGINS)
+  set(MITK_BUILD_ALL_PLUGINS TRUE)
+endif()
+
+if(NOT DEFINED MITK_BUILD_EXAMPLES)
+  set(MITK_BUILD_EXAMPLES TRUE)
+endif()
+
 set(INITIAL_CMAKECACHE_OPTIONS "
-BLUEBERRY_BUILD_TESTING:BOOL=TRUE
-BLUEBERRY_BUILD_ALL_PLUGINS:BOOL=TRUE
-MITK_BUILD_ALL_PLUGINS:BOOL=TRUE
+BLUEBERRY_BUILD_ALL_PLUGINS:BOOL=${MITK_BUILD_ALL_PLUGINS}
+MITK_BUILD_ALL_PLUGINS:BOOL=${MITK_BUILD_ALL_PLUGINS}
 MITK_BUILD_ALL_APPS:BOOL=${MITK_BUILD_ALL_APPS}
-MITK_BUILD_EXAMPLES:BOOL=TRUE
+MITK_BUILD_EXAMPLES:BOOL=${MITK_BUILD_EXAMPLES}
 SUPERBUILD_EXCLUDE_MITKBUILD_TARGET:BOOL=TRUE
 MITK_USE_Boost:BOOL=${MITK_USE_Boost}
 MITK_USE_OpenCV:BOOL=${MITK_USE_OpenCV}
 ${ADDITIONAL_CMAKECACHE_OPTION}
 ")
 
 # Write a cache file for populating the MITK initial cache (not the superbuild cache).
 # This can be used to provide variables which are not passed through the
 # superbuild process to the MITK configure step)
 if(MITK_INITIAL_CACHE)
   set(mitk_cache_file "${CTEST_SCRIPT_DIRECTORY}/mitk_initial_cache.txt")
   file(WRITE "${mitk_cache_file}" "${MITK_INITIAL_CACHE}")
   set(INITIAL_CMAKECACHE_OPTIONS "${INITIAL_CMAKECACHE_OPTIONS}
 MITK_INITIAL_CACHE_FILE:INTERNAL=${mitk_cache_file}
 ")
 endif()
 
 
 #
 # Download and include dashboard driver script 
 #
 if(NOT DEFINED GIT_BRANCH OR GIT_BRANCH STREQUAL "")
   set(hb "HEAD")
 else()
   set(hb "refs/heads/${GIT_BRANCH}")
 endif()
 set(url "http://mitk.org/git/?p=MITK.git;a=blob_plain;f=CMake/MITKDashboardDriverScript.cmake;hb=${hb}")
 set(dest ${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}.driver)
 downloadFile("${url}" "${dest}")
 include(${dest})
 
 
diff --git a/Core/Code/Algorithms/mitkExtractSliceFilter.cpp b/Core/Code/Algorithms/mitkExtractSliceFilter.cpp
index bbb5600f18..58dd938f99 100644
--- a/Core/Code/Algorithms/mitkExtractSliceFilter.cpp
+++ b/Core/Code/Algorithms/mitkExtractSliceFilter.cpp
@@ -1,592 +1,591 @@
-/*=========================================================================
+/*===================================================================
 
-Program:   Medical Imaging & Interaction Toolkit
-Language:  C++
-Date:      $Date$
-Version:   $Revision: $
+The Medical Imaging Interaction Toolkit (MITK)
 
-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.
+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 the above copyright notices for more information.
+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 "mitkExtractSliceFilter.h"
 #include <vtkImageData.h>
 #include <vtkSmartPointer.h>
 #include <vtkLinearTransform.h>
 #include <vtkImageChangeInformation.h>
 #include <mitkAbstractTransformGeometry.h>
 #include <vtkGeneralTransform.h>
 
 
 mitk::ExtractSliceFilter::ExtractSliceFilter(vtkImageReslice* reslicer ){
 
   if(reslicer == NULL){
     m_Reslicer = vtkSmartPointer<vtkImageReslice>::New();
   }
   else
   {
     m_Reslicer = reslicer;
   }
 
   m_TimeStep = 0;
   m_Reslicer->ReleaseDataFlagOn();
   m_InterpolationMode = ExtractSliceFilter::RESLICE_NEAREST;
   m_ResliceTransform = NULL;
   m_InPlaneResampleExtentByGeometry = false;
   m_OutPutSpacing = new mitk::ScalarType[2];
   m_OutputDimension = 2;
   m_ZSpacing = 1.0;
   m_ZMin = 0;
   m_ZMax = 0;
   m_VtkOutputRequested = false;
 
 }
 
 mitk::ExtractSliceFilter::~ExtractSliceFilter(){
   m_ResliceTransform = NULL;
   m_WorldGeometry = NULL;
   delete [] m_OutPutSpacing;
 }
 
 void mitk::ExtractSliceFilter::GenerateOutputInformation(){
   //TODO try figure out how to set the specs of the slice before it is actually extracted
   /*Image::Pointer output = this->GetOutput();
   Image::ConstPointer input = this->GetInput();
   if (input.IsNull()) return;
   unsigned int dimensions[2];
   dimensions[0] = m_WorldGeometry->GetExtent(0);
   dimensions[1] = m_WorldGeometry->GetExtent(1);
   output->Initialize(input->GetPixelType(), 2, dimensions, 1);*/
 }
 
 void mitk::ExtractSliceFilter::GenerateInputRequestedRegion(){
   //As we want all pixel information fo the image in our plane, the requested region
   //is set to the largest possible region in the image.
   //This is needed because an oblique plane has a larger extent then the image
   //and the in pipeline it is checked via PropagateResquestedRegion(). But the
   //extent of the slice is actually fitting because it is oblique within the image. 
   ImageToImageFilter::InputImagePointer input =  const_cast< ImageToImageFilter::InputImageType* > ( this->GetInput() );
   input->SetRequestedRegionToLargestPossibleRegion();
 }
 
 
 mitk::ScalarType* mitk::ExtractSliceFilter::GetOutputSpacing(){
   return m_OutPutSpacing;
 }
 
 
 void mitk::ExtractSliceFilter::GenerateData(){
 
   mitk::Image *input = const_cast< mitk::Image * >( this->GetInput() );
 
   if (!input)
   {
     MITK_ERROR << "mitk::ExtractSliceFilter: No input image available. Please set the input!" << std::endl;
     itkExceptionMacro("mitk::ExtractSliceFilter: No input image available. Please set the input!");
     return;
   }
 
   if(!m_WorldGeometry)
   {
     MITK_ERROR << "mitk::ExtractSliceFilter: No Geometry for reslicing available." << std::endl;
     itkExceptionMacro("mitk::ExtractSliceFilter: No Geometry for reslicing available.");
     return;
   }
 
 
   const TimeSlicedGeometry *inputTimeGeometry = this->GetInput()->GetTimeSlicedGeometry();
   if ( ( inputTimeGeometry == NULL )
     || ( inputTimeGeometry->GetTimeSteps() == 0 ) )
   {
     itkWarningMacro(<<"Error reading input image TimeSlicedGeometry.");
     return;
   }
 
   // is it a valid timeStep?
   if ( inputTimeGeometry->IsValidTime( m_TimeStep ) == false )
   {
     itkWarningMacro(<<"This is not a valid timestep: "<< m_TimeStep );
     return;
   }
 
   // check if there is something to display.
   if ( ! input->IsVolumeSet( m_TimeStep ) ) 
   {
     itkWarningMacro(<<"No volume data existent at given timestep "<< m_TimeStep ); 
     return;
   }
 
 
 
 
   /*================#BEGIN setup vtkImageRslice properties================*/
   Point3D origin;
   Vector3D right, bottom, normal;
   double widthInMM, heightInMM;
   Vector2D extent;
 
 
   const PlaneGeometry* planeGeometry = dynamic_cast<const PlaneGeometry*>(m_WorldGeometry);
 
 
   if ( planeGeometry != NULL )
   {
     //if the worldGeomatry is a PlaneGeometry everthing is straight forward
 
     origin = planeGeometry->GetOrigin();
     right  = planeGeometry->GetAxisVector( 0 );
     bottom = planeGeometry->GetAxisVector( 1 );
     normal = planeGeometry->GetNormal();
 
     if ( m_InPlaneResampleExtentByGeometry )
     {
       // Resampling grid corresponds to the current world geometry. This
       // means that the spacing of the output 2D image depends on the
       // currently selected world geometry, and *not* on the image itself.
       extent[0] = m_WorldGeometry->GetExtent( 0 );
       extent[1] = m_WorldGeometry->GetExtent( 1 );
     }
     else
     {
       // Resampling grid corresponds to the input geometry. This means that
       // the spacing of the output 2D image is directly derived from the
       // associated input image, regardless of the currently selected world
       // geometry.
       Vector3D rightInIndex, bottomInIndex;
       inputTimeGeometry->GetGeometry3D( m_TimeStep )->WorldToIndex( right, rightInIndex );
       inputTimeGeometry->GetGeometry3D( m_TimeStep )->WorldToIndex( bottom, bottomInIndex );
       extent[0] = rightInIndex.GetNorm();
       extent[1] = bottomInIndex.GetNorm();
     }
 
     // Get the extent of the current world geometry and calculate resampling
     // spacing therefrom.
     widthInMM = m_WorldGeometry->GetExtentInMM( 0 );
     heightInMM = m_WorldGeometry->GetExtentInMM( 1 );
 
 
     m_OutPutSpacing[0] = widthInMM / extent[0];
     m_OutPutSpacing[1] = heightInMM / extent[1];
 
 
     right.Normalize();
     bottom.Normalize();
     normal.Normalize();
 
 
     /*
     * Transform the origin to center based coordinates.
     * Note:
     * This is needed besause vtk's origin is center based too (!!!) ( see 'The VTK book' page 88 )
     * and the worldGeometry surrouding the image is no imageGeometry. So the worldGeometry
     * has its origin at the corner of the voxel and needs to be transformed.
     */
     origin += right * ( m_OutPutSpacing[0] * 0.5 );
     origin += bottom * ( m_OutPutSpacing[1] * 0.5 );
 
 
 
     //set the tranform for reslicing.
     // Use inverse transform of the input geometry for reslicing the 3D image.
     // This is needed if the image volume already transformed 
     if(m_ResliceTransform != NULL)
       m_Reslicer->SetResliceTransform(m_ResliceTransform->GetVtkTransform()->GetLinearInverse());
 
 
     // Set background level to TRANSLUCENT (see Geometry2DDataVtkMapper3D),
     // else the background of the image turns out gray
     m_Reslicer->SetBackgroundLevel( -32768 );
 
   }  
   else{
     //Code for curved planes, mostly taken 1:1 from imageVtkMapper2D and not tested yet.
     // Do we have an AbstractTransformGeometry?
     // This is the case for AbstractTransformGeometry's (e.g. a ThinPlateSplineCurvedGeometry )
     const mitk::AbstractTransformGeometry* abstractGeometry =
       dynamic_cast< const AbstractTransformGeometry * >(m_WorldGeometry);
 
     if(abstractGeometry != NULL)
     {
       m_ResliceTransform = abstractGeometry;
 
       extent[0] = abstractGeometry->GetParametricExtent(0);
       extent[1] = abstractGeometry->GetParametricExtent(1);
 
       widthInMM = abstractGeometry->GetParametricExtentInMM(0);
       heightInMM = abstractGeometry->GetParametricExtentInMM(1);
 
       m_OutPutSpacing[0] = widthInMM / extent[0];
       m_OutPutSpacing[1] = heightInMM / extent[1];
 
       origin = abstractGeometry->GetPlane()->GetOrigin();
 
       right = abstractGeometry->GetPlane()->GetAxisVector(0);
       right.Normalize();
 
       bottom = abstractGeometry->GetPlane()->GetAxisVector(1);
       bottom.Normalize();
 
       normal = abstractGeometry->GetPlane()->GetNormal();
       normal.Normalize();
 
       // Use a combination of the InputGeometry *and* the possible non-rigid
       // AbstractTransformGeometry for reslicing the 3D Image
       vtkSmartPointer<vtkGeneralTransform> composedResliceTransform = vtkGeneralTransform::New();
       composedResliceTransform->Identity();
       composedResliceTransform->Concatenate(
         inputTimeGeometry->GetGeometry3D( m_TimeStep )->GetVtkTransform()->GetLinearInverse() );
       composedResliceTransform->Concatenate(
         abstractGeometry->GetVtkAbstractTransform()
         );
 
       m_Reslicer->SetResliceTransform( composedResliceTransform );
       composedResliceTransform->UnRegister( NULL ); // decrease RC
 
       // Set background level to BLACK instead of translucent, to avoid
       // boundary artifacts (see Geometry2DDataVtkMapper3D)
       m_Reslicer->SetBackgroundLevel( -1023 );
     } 
     else
     {
       itkExceptionMacro("mitk::ExtractSliceFilter: No fitting geometry for reslice axis!");
       return;
     }
 
   }
 
   if(m_ResliceTransform != NULL){
     //if the resliceTransform is set the reslice axis are recalculated.
     //Thus the geometry information is not fitting. Therefor a unitSpacingFilter
     //is used to set up a global spacing of 1 and compensate the transform.
     vtkSmartPointer<vtkImageChangeInformation> unitSpacingImageFilter = vtkSmartPointer<vtkImageChangeInformation>::New() ;
     unitSpacingImageFilter->ReleaseDataFlagOn();
 
     unitSpacingImageFilter->SetOutputSpacing( 1.0, 1.0, 1.0 );
     unitSpacingImageFilter->SetInput( input->GetVtkImageData(m_TimeStep) );
 
     m_Reslicer->SetInput(unitSpacingImageFilter->GetOutput() );
   }
   else
   {
     //if no tranform is set the image can be used directly
     m_Reslicer->SetInput(input->GetVtkImageData(m_TimeStep));
   }
 
 
   /*setup the plane where vktImageReslice extracts the slice*/
 
   //ResliceAxesOrigin is the ancor point of the plane
   double originInVtk[3];
   itk2vtk(origin, originInVtk);
   m_Reslicer->SetResliceAxesOrigin(originInVtk);
 
 
   //the cosines define the plane: x and y are the direction vectors, n is the planes normal
   //this specifies a matrix 3x3
   //  x1 y1 n1
   //  x2 y2 n2
   //  x3 y3 n3
   double cosines[9];
 
   vnl2vtk(right.GetVnlVector(), cosines);//x
 
   vnl2vtk(bottom.GetVnlVector(), cosines + 3);//y
 
   vnl2vtk(normal.GetVnlVector(), cosines + 6);//n
 
   m_Reslicer->SetResliceAxesDirectionCosines(cosines);
 
 
   //we only have one slice, not a volume
   m_Reslicer->SetOutputDimensionality(m_OutputDimension);
 
 
   //set the interpolation mode for slicing
   switch(this->m_InterpolationMode){
     case RESLICE_NEAREST:
       m_Reslicer->SetInterpolationModeToNearestNeighbor();
       break;
     case RESLICE_LINEAR:
       m_Reslicer->SetInterpolationModeToLinear();
       break;
     case RESLICE_CUBIC:
       m_Reslicer->SetInterpolationModeToCubic();
     default:
       //the default interpolation used by mitk
       m_Reslicer->SetInterpolationModeToNearestNeighbor();
   }
 
 
   /*========== BEGIN setup extent of the slice ==========*/
   int xMin, xMax, yMin, yMax;
 
   vtkFloatingPointType sliceBounds[6];
   if(m_WorldGeometry->GetReferenceGeometry()){
 
 
     for ( int i = 0; i < 6; ++i )
     {
       sliceBounds[i] = 0.0;
     }
     this->GetClippedPlaneBounds( m_WorldGeometry->GetReferenceGeometry(), planeGeometry, sliceBounds );
 
     // Calculate output extent (integer values)
     xMin = static_cast< int >( sliceBounds[0] / m_OutPutSpacing[0] + 0.5 );
     xMax = static_cast< int >( sliceBounds[1] / m_OutPutSpacing[0] + 0.5 );
     yMin = static_cast< int >( sliceBounds[2] / m_OutPutSpacing[1] + 0.5 );
     yMax = static_cast< int >( sliceBounds[3] / m_OutPutSpacing[1] + 0.5 );
 
   }else
   {
     // If no reference geometry is available, we also don't know about the
     // maximum plane size;
     xMin = yMin = 0;
     xMax = static_cast< int >( extent[0]);
     yMax = static_cast< int >( extent[1]);
   }
 
 
   m_Reslicer->SetOutputExtent(xMin, xMax-1, yMin, yMax-1, m_ZMin, m_ZMax );
   /*========== END setup extent of the slice ==========*/
 
 
   m_Reslicer->SetOutputOrigin( 0.0, 0.0, 0.0 );
 
   m_Reslicer->SetOutputSpacing( m_OutPutSpacing[0], m_OutPutSpacing[1], m_ZSpacing );
 
 
   //TODO check the following lines, they are responsible wether vtk error outputs appear or not
   m_Reslicer->UpdateWholeExtent(); //this produces a bad allocation error for 2D images
   //m_Reslicer->GetOutput()->UpdateInformation();
   //m_Reslicer->GetOutput()->SetUpdateExtentToWholeExtent();
 
   //start the pipeline
   m_Reslicer->Update();
 
   /*================ #END setup vtkImageRslice properties================*/
 
   if(m_VtkOutputRequested){
     return;
     //no converting to mitk
     //no mitk geometry will be set, as the output is vtkImageData only!!!
   }
   else
   {
     /*================ #BEGIN Get the slice from vtkImageReslice and convert it to mit::Image================*/
     vtkImageData* reslicedImage;
     reslicedImage = m_Reslicer->GetOutput();
 
 
 
     if(!reslicedImage)
     {
       itkWarningMacro(<<"Reslicer returned empty image");
       return;
     }
 
 
     mitk::Image::Pointer resultImage = this->GetOutput();
 
     //initialize resultimage with the specs of the vtkImageData object returned from vtkImageReslice
     resultImage->Initialize(reslicedImage);
 
     //transfer the voxel data
     resultImage->SetVolume(reslicedImage->GetScalarPointer());
 
 
     //set the geometry from current worldgeometry for the reusultimage
     //this is needed that the image has the correct mitk geometry
     //the originalGeometry is the Geometry of the result slice
     AffineGeometryFrame3D::Pointer originalGeometryAGF = m_WorldGeometry->Clone();
     Geometry2D::Pointer originalGeometry = dynamic_cast<Geometry2D*>( originalGeometryAGF.GetPointer() );
 
     originalGeometry->GetIndexToWorldTransform()->SetMatrix(m_WorldGeometry->GetIndexToWorldTransform()->GetMatrix());
 
     //the origin of the worldGeometry is transformed to center based coordinates to be an imageGeometry
     Point3D sliceOrigin = originalGeometry->GetOrigin();
 
     sliceOrigin += right * ( m_OutPutSpacing[0] * 0.5 );
     sliceOrigin += bottom * ( m_OutPutSpacing[1] * 0.5 );
 
     //a worldGeometry is no imageGeometry, thus it is manually set to true
     originalGeometry->ImageGeometryOn();
 
 
     /*At this point we have to adjust the geometry because the origin isn't correct.
     The wrong origin is related to the rotation of the current world geometry plane.
     This causes errors on transfering world to index coordinates. We just shift the
     origin in each direction about the amount of the expanding (needed while rotating 
     the plane).
     */
     Vector3D axis0 = originalGeometry->GetAxisVector(0);
     Vector3D axis1 = originalGeometry->GetAxisVector(1);
     axis0.Normalize();
     axis1.Normalize();
 
 
     //adapt the origin. Note that for orthogonal planes the minima are '0' and thus the origin stays the same.
     sliceOrigin += (axis0 * (xMin * m_OutPutSpacing[0])) + (axis1 * (yMin * m_OutPutSpacing[1]));
 
     originalGeometry->SetOrigin(sliceOrigin);
 
     originalGeometry->Modified();
 
 
     resultImage->SetGeometry( originalGeometry );
 
 
     /*the bounds as well as the extent of the worldGeometry are not adapted correctly during crosshair rotation.
     This is only a quick fix and has to be evaluated.
     The new bounds are set via the max values of the calcuted slice extent. It will look like [ 0, x, 0, y, 0, 1].
     */
     mitk::BoundingBox::BoundsArrayType boundsCopy;
     boundsCopy[0] = boundsCopy[2] = boundsCopy[4] = 0;
     boundsCopy[5] = 1;
     boundsCopy[1] =  xMax - xMin;
     boundsCopy[3] =  yMax - yMin;
     resultImage->GetGeometry()->SetBounds(boundsCopy);
 
     /*================ #END Get the slice from vtkImageReslice and convert it to mitk Image================*/
   }
 }
 
 
 bool mitk::ExtractSliceFilter::GetClippedPlaneBounds(vtkFloatingPointType bounds[6]){
 
   if(!m_WorldGeometry || !this->GetInput())
     return false;
 
   return this->GetClippedPlaneBounds(m_WorldGeometry->GetReferenceGeometry(), dynamic_cast< const PlaneGeometry * >( m_WorldGeometry ), bounds); 
 }
 
 
 bool mitk::ExtractSliceFilter::GetClippedPlaneBounds( const Geometry3D *boundingGeometry, 
                                                      const PlaneGeometry *planeGeometry, vtkFloatingPointType *bounds )
 {
   bool b =  this->CalculateClippedPlaneBounds(boundingGeometry, planeGeometry, bounds); 
 
   return b;
 }
 
 
 bool mitk::ExtractSliceFilter
 ::CalculateClippedPlaneBounds( const Geometry3D *boundingGeometry, 
                               const PlaneGeometry *planeGeometry, vtkFloatingPointType *bounds )
 {
   // Clip the plane with the bounding geometry. To do so, the corner points 
   // of the bounding box are transformed by the inverse transformation 
   // matrix, and the transformed bounding box edges derived therefrom are 
   // clipped with the plane z=0. The resulting min/max values are taken as 
   // bounds for the image reslicer.
   const BoundingBox *boundingBox = boundingGeometry->GetBoundingBox();
 
   BoundingBox::PointType bbMin = boundingBox->GetMinimum();
   BoundingBox::PointType bbMax = boundingBox->GetMaximum();
   
   vtkPoints *points = vtkPoints::New();
   if(boundingGeometry->GetImageGeometry())
   {
     points->InsertPoint( 0, bbMin[0]-0.5, bbMin[1]-0.5, bbMin[2]-0.5 );
     points->InsertPoint( 1, bbMin[0]-0.5, bbMin[1]-0.5, bbMax[2]-0.5 );
     points->InsertPoint( 2, bbMin[0]-0.5, bbMax[1]-0.5, bbMax[2]-0.5 );
     points->InsertPoint( 3, bbMin[0]-0.5, bbMax[1]-0.5, bbMin[2]-0.5 );
     points->InsertPoint( 4, bbMax[0]-0.5, bbMin[1]-0.5, bbMin[2]-0.5 );
     points->InsertPoint( 5, bbMax[0]-0.5, bbMin[1]-0.5, bbMax[2]-0.5 );
     points->InsertPoint( 6, bbMax[0]-0.5, bbMax[1]-0.5, bbMax[2]-0.5 );
     points->InsertPoint( 7, bbMax[0]-0.5, bbMax[1]-0.5, bbMin[2]-0.5 );
   }
   else
   {
     points->InsertPoint( 0, bbMin[0], bbMin[1], bbMin[2] );
     points->InsertPoint( 1, bbMin[0], bbMin[1], bbMax[2] );
     points->InsertPoint( 2, bbMin[0], bbMax[1], bbMax[2] );
     points->InsertPoint( 3, bbMin[0], bbMax[1], bbMin[2] );
     points->InsertPoint( 4, bbMax[0], bbMin[1], bbMin[2] );
     points->InsertPoint( 5, bbMax[0], bbMin[1], bbMax[2] );
     points->InsertPoint( 6, bbMax[0], bbMax[1], bbMax[2] );
     points->InsertPoint( 7, bbMax[0], bbMax[1], bbMin[2] );
   }
 
   vtkPoints *newPoints = vtkPoints::New();
 
   vtkTransform *transform = vtkTransform::New();
   transform->Identity();
   transform->Concatenate(
     planeGeometry->GetVtkTransform()->GetLinearInverse()
     );
 
   transform->Concatenate( boundingGeometry->GetVtkTransform() );
 
   transform->TransformPoints( points, newPoints );
   transform->Delete();
 
   bounds[0] = bounds[2] = 10000000.0;
   bounds[1] = bounds[3] = -10000000.0;
   bounds[4] = bounds[5] = 0.0;
 
   this->LineIntersectZero( newPoints, 0, 1, bounds );
   this->LineIntersectZero( newPoints, 1, 2, bounds );
   this->LineIntersectZero( newPoints, 2, 3, bounds );
   this->LineIntersectZero( newPoints, 3, 0, bounds );
   this->LineIntersectZero( newPoints, 0, 4, bounds );
   this->LineIntersectZero( newPoints, 1, 5, bounds );
   this->LineIntersectZero( newPoints, 2, 6, bounds );
   this->LineIntersectZero( newPoints, 3, 7, bounds );
   this->LineIntersectZero( newPoints, 4, 5, bounds );
   this->LineIntersectZero( newPoints, 5, 6, bounds );
   this->LineIntersectZero( newPoints, 6, 7, bounds );
   this->LineIntersectZero( newPoints, 7, 4, bounds );
 
   // clean up vtk data
   points->Delete();
   newPoints->Delete();
 
   if ( (bounds[0] > 9999999.0) || (bounds[2] > 9999999.0)
     || (bounds[1] < -9999999.0) || (bounds[3] < -9999999.0) )
   {
     return false;
   }
   else
   {
     // The resulting bounds must be adjusted by the plane spacing, since we
     // we have so far dealt with index coordinates
     const float *planeSpacing = planeGeometry->GetFloatSpacing();
     bounds[0] *= planeSpacing[0];
     bounds[1] *= planeSpacing[0];
     bounds[2] *= planeSpacing[1];
     bounds[3] *= planeSpacing[1];
     bounds[4] *= planeSpacing[2];
     bounds[5] *= planeSpacing[2];
     return true;
   }
 }
 
 bool mitk::ExtractSliceFilter
 ::LineIntersectZero( vtkPoints *points, int p1, int p2,
                     vtkFloatingPointType *bounds )
 {
   vtkFloatingPointType point1[3];
   vtkFloatingPointType point2[3];
   points->GetPoint( p1, point1 );
   points->GetPoint( p2, point2 );
 
   if ( (point1[2] * point2[2] <= 0.0) && (point1[2] != point2[2]) )
   {
     double x, y;
     x = ( point1[0] * point2[2] - point1[2] * point2[0] ) / ( point2[2] - point1[2] );
     y = ( point1[1] * point2[2] - point1[2] * point2[1] ) / ( point2[2] - point1[2] );
 
     if ( x < bounds[0] ) { bounds[0] = x; }
     if ( x > bounds[1] ) { bounds[1] = x; }
     if ( y < bounds[2] ) { bounds[2] = y; }
     if ( y > bounds[3] ) { bounds[3] = y; }
     bounds[4] = bounds[5] = 0.0;
     return true;
   }
   return false;
 }
diff --git a/Core/Code/Algorithms/mitkExtractSliceFilter.h b/Core/Code/Algorithms/mitkExtractSliceFilter.h
index b2423feaeb..ce72343d96 100644
--- a/Core/Code/Algorithms/mitkExtractSliceFilter.h
+++ b/Core/Code/Algorithms/mitkExtractSliceFilter.h
@@ -1,185 +1,184 @@
-/*=========================================================================
+/*===================================================================
 
-Program:   Medical Imaging & Interaction Toolkit
-Language:  C++
-Date:      $Date$
-Version:   $Revision: $
+The Medical Imaging Interaction Toolkit (MITK)
 
-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.
+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 the above copyright notices for more information.
+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 mitkExtractSliceFilter_h_Included
 #define mitkExtractSliceFilter_h_Included
 
 
 #include "MitkExports.h"
 #include "mitkImageToImageFilter.h"
 #include <vtkSmartPointer.h>
 
 #include <vtkImageReslice.h>
 #include <vtkMatrix4x4.h>
 #include <vtkImageData.h>
 #include <vtkPoints.h>
 #include <vtkTransform.h>
 #include <vtkAbstractTransform.h>
 
 namespace mitk
 {
   /**
   \brief ExtractSliceFilter extracts a 2D abitrary oriented slice from a 3D volume.
 
   The filter can reslice in all orthogonal planes such as sagittal, coronal and transversal,
   and is also able to reslice a abitrary oriented oblique plane.
   Curved planes are specified via an AbstractTransformGeometry as the input worldgeometry.
 
   The convinient workflow is:
   1. Set an image as input.
   2. Set the worldGeometry2D. This defines a grid where the slice is being extracted
   3. And then start the pipeline.
 
   There are a few more properties that can be set to modify the behavior of the slicing.
   The properties are:
   - interpolation mode either Nearestneighbor, Linear or Cubic.
   - a transform this is a convinient way to adapt the reslice axis for the case
   that the image is transformed e.g. rotated.
   - time step the time step in a timesliced volume.
   - resample by geometry wether the resampling grid corresponds to the specs of the
   worldgeometry or is directly derived from the input image
 
   By default the properties are set to:
   - interpolation mode Nearestneighbor.
   - a transform NULL (No transform is set).
   - time step 0.
   - resample by geometry false (Corresponds to input image).
   */
   class MITK_CORE_EXPORT ExtractSliceFilter : public ImageToImageFilter
   {
   public:
 
     mitkClassMacro(ExtractSliceFilter, ImageToImageFilter);
     itkNewMacro(ExtractSliceFilter);
 
     mitkNewMacro1Param(Self, vtkImageReslice*);
 
     /** \brief Set the axis where to reslice at.*/
     void SetWorldGeometry(const Geometry2D* geometry ){ this->m_WorldGeometry = geometry; }
 
     /** \brief Set the time step in the 4D volume */
     void SetTimeStep( unsigned int timestep){ this->m_TimeStep = timestep; }
     unsigned int GetTimeStep(){ return this->m_TimeStep; }
 
     /** \brief Set a transform for the reslice axes.
     * This transform is needed if the image volume itself is transformed. (Effects the reslice axis)
     */
     void SetResliceTransformByGeometry(const Geometry3D* transform){ this->m_ResliceTransform = transform; }
 
     /** \brief Resampling grid corresponds to: false->image    true->worldgeometry*/
     void SetInPlaneResampleExtentByGeometry(bool inPlaneResampleExtentByGeometry){ this->m_InPlaneResampleExtentByGeometry = inPlaneResampleExtentByGeometry; }
 
     /** \brief Sets the output dimension of the slice*/
     void SetOutputDimensionality(unsigned int dimension){ this->m_OutputDimension = dimension; }
 
     /** \brief Set the spacing in z direction manually.
     * Required if the outputDimension is > 2.
     */
     void SetOutputSpacingZDirection(double zSpacing){ this->m_ZSpacing = zSpacing; }
 
     /** \brief Set the extent in pixel for direction z manualy.
     Required if the output dimension is > 2.
     */
     void SetOutputExtentZDirection(int zMin, int zMax) { this->m_ZMin = zMin; this->m_ZMax = zMax; }
 
     /** \brief Get the bounding box of the slice [xMin, xMax, yMin, yMax, zMin, zMax]
     * The method uses the input of the filter to calculate the bounds. 
     * It is recommended to use 
     * GetClippedPlaneBounds(const Geometry3D*, const PlaneGeometry*, vtkFloatingPointType*)
     * if you are not sure about the input.
     */
     bool GetClippedPlaneBounds(double bounds[6]);
 
     /** \brief Get the bounding box of the slice [xMin, xMax, yMin, yMax, zMin, zMax]*/
     bool GetClippedPlaneBounds( const Geometry3D *boundingGeometry,
       const PlaneGeometry *planeGeometry, vtkFloatingPointType *bounds );
 
     /** \brief Get the spacing of the slice. returns mitk::ScalarType[2] */
     mitk::ScalarType* GetOutputSpacing();
 
     /** \brief Get Output as vtkImageData.
     * Note:
     * SetVtkOutputRequest(true) has to be called at least once before
     * GetVtkOutput(). Otherwise the output is empty for the first update step.
     */
     vtkImageData* GetVtkOutput(){ m_VtkOutputRequested = true; return m_Reslicer->GetOutput(); }
 
     /** Set VtkOutPutRequest to suppress the convertion of the image.
     * It is suggested to use this with GetVtkOutput().
     * Note:
     * SetVtkOutputRequest(true) has to be called at least once before
     * GetVtkOutput(). Otherwise the output is empty for the first update step.
     */
     void SetVtkOutputRequest(bool isRequested){ m_VtkOutputRequested = isRequested; }
 
     /** \brief Get the reslices axis matrix.
     * Note: the axis are recalculated when calling SetResliceTransformByGeometry.
     */
     vtkMatrix4x4* GetResliceAxes(){
       return this->m_Reslicer->GetResliceAxes();
     }
 
     enum ResliceInterpolation { RESLICE_NEAREST, RESLICE_LINEAR, RESLICE_CUBIC };
 
     void SetInterpolationMode( ExtractSliceFilter::ResliceInterpolation interpolation){ this->m_InterpolationMode = interpolation; }
 
   protected:
     ExtractSliceFilter(vtkImageReslice* reslicer = NULL);
     virtual ~ExtractSliceFilter();
 
     virtual void GenerateData();
     virtual void GenerateOutputInformation();
     virtual void GenerateInputRequestedRegion();
 
 
     const Geometry2D* m_WorldGeometry;
     vtkSmartPointer<vtkImageReslice> m_Reslicer;
 
     unsigned int m_TimeStep;
 
     unsigned int m_OutputDimension;
 
     double m_ZSpacing;
 
     int m_ZMin;
 
     int m_ZMax;
 
     ResliceInterpolation m_InterpolationMode;
 
     const Geometry3D* m_ResliceTransform;
 
     bool m_InPlaneResampleExtentByGeometry;//Resampling grid corresponds to:  false->image    true->worldgeometry
 
     mitk::ScalarType* m_OutPutSpacing;
 
 
     bool m_VtkOutputRequested;
 
     /** \brief Internal helper method for intersection testing used only in CalculateClippedPlaneBounds() */
     bool LineIntersectZero( vtkPoints *points, int p1, int p2,
       vtkFloatingPointType *bounds );
 
     /** \brief Calculate the bounding box of the resliced image. This is necessary for
     * arbitrarily rotated planes in an image volume. A rotated plane (e.g. in swivel mode)
     * will have a new bounding box, which needs to be calculated. */
     bool CalculateClippedPlaneBounds( const Geometry3D *boundingGeometry,
       const PlaneGeometry *planeGeometry, vtkFloatingPointType *bounds );
   };
 }
 
 #endif // mitkExtractSliceFilter_h_Included
diff --git a/Core/Code/Algorithms/mitkUIDGenerator.h b/Core/Code/Algorithms/mitkUIDGenerator.h
index 417de7c4f4..a5bd3f5c8a 100644
--- a/Core/Code/Algorithms/mitkUIDGenerator.h
+++ b/Core/Code/Algorithms/mitkUIDGenerator.h
@@ -1,49 +1,58 @@
 /*===================================================================
 
 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 MITK_UID_GENERATOR_INDCLUDED_FASAWE
 #define MITK_UID_GENERATOR_INDCLUDED_FASAWE
 
 #include<string>
 #include <MitkExports.h>
 
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable: 4251)
+#endif
+
 namespace mitk {
 
 /*!
   \brief Generated unique IDs
 
   Creates (somehow most of the time) unique IDs from a given prefix, 
   the current date/time and a random part.
 
   The prefix is given to the constructor, together with the desired
   length of the random part (minimum 5 digits). 
 
   You will get another quite unique ID each time you call GetUID.
 */
 class MITK_CORE_EXPORT UIDGenerator
 {
   public:
     UIDGenerator(const char* prefix = "UID_", unsigned int lengthOfRandomPart = 8);
 
     std::string GetUID();
   private:
     std::string m_Prefix;
     unsigned int m_LengthOfRandomPart;
 };
 
 }
 
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
 #endif
diff --git a/Core/Code/Controllers/mitkCoreActivator.cpp b/Core/Code/Controllers/mitkCoreActivator.cpp
index 22a996b3ef..b3b8e165de 100644
--- a/Core/Code/Controllers/mitkCoreActivator.cpp
+++ b/Core/Code/Controllers/mitkCoreActivator.cpp
@@ -1,58 +1,80 @@
 /*===================================================================
 
 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 "mitkRenderingManager.h"
 #include "mitkPlanePositionManager.h"
 #include "mitkCoreDataNodeReader.h"
 
 #include <mitkModuleActivator.h>
 
+void HandleMicroServicesMessages(mitk::MsgType type, const char* msg)
+{
+  switch (type)
+  {
+  case mitk::DebugMsg:
+    MITK_DEBUG << msg;
+    break;
+  case mitk::InfoMsg:
+    MITK_INFO << msg;
+    break;
+  case mitk::WarningMsg:
+    MITK_WARN << msg;
+    break;
+  case mitk::ErrorMsg:
+    MITK_ERROR << msg;
+    break;
+  }
+}
+
 /*
  * This is the module activator for the "Mitk" module. It registers core services
  * like ...
  */
 class MitkCoreActivator : public mitk::ModuleActivator
 {
 public:
 
   void Load(mitk::ModuleContext* context)
   {
+    // Handle messages from CppMicroServices
+    mitk::installMsgHandler(HandleMicroServicesMessages);
+
     //m_RenderingManager = mitk::RenderingManager::New();
     //context->RegisterService<mitk::RenderingManager>(renderingManager.GetPointer());
     m_PlanePositionManager = mitk::PlanePositionManagerService::New();
     context->RegisterService<mitk::PlanePositionManagerService>(m_PlanePositionManager);
 
     m_CoreDataNodeReader = mitk::CoreDataNodeReader::New();
     context->RegisterService<mitk::IDataNodeReader>(m_CoreDataNodeReader);
   }
 
   void Unload(mitk::ModuleContext* )
   {
     // The mitk::ModuleContext* argument of the Unload() method
     // will always be 0 for the Mitk library. It makes no sense
     // to use it at this stage anyway, since all libraries which
     // know about the module system have already been unloaded.
   }
 
 private:
 
   //mitk::RenderingManager::Pointer m_RenderingManager;
   mitk::PlanePositionManagerService::Pointer m_PlanePositionManager;
   mitk::CoreDataNodeReader::Pointer m_CoreDataNodeReader;
 };
 
 US_EXPORT_MODULE_ACTIVATOR(Mitk, MitkCoreActivator)
 
diff --git a/Core/Code/Controllers/mitkVtkInteractorCameraController.cpp b/Core/Code/Controllers/mitkVtkInteractorCameraController.cpp
index c8235cfb5e..1940097eba 100644
--- a/Core/Code/Controllers/mitkVtkInteractorCameraController.cpp
+++ b/Core/Code/Controllers/mitkVtkInteractorCameraController.cpp
@@ -1,195 +1,195 @@
 /*===================================================================
 
 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 "mitkVtkInteractorCameraController.h"
 #include "mitkInteractionConst.h"
 #include <vtkInteractorStyleSwitch.h>
 #include <vtkRenderWindowInteractor.h>
 #include <vtkCommand.h>
 #include "mitkAction.h"
 #include "mitkVtkPropRenderer.h"
 
 mitk::VtkInteractorCameraController::VtkInteractorCameraController(const char* type) : CameraController(type), m_VtkInteractor(NULL)
 {
   //m_VtkInteractor = vtkRenderWindowInteractor::New();
  
 }
 
 mitk::VtkInteractorCameraController::~VtkInteractorCameraController()
 {
   if(m_VtkInteractor!=NULL)
   {
     m_VtkInteractor->SetRenderWindow(NULL);
     m_VtkInteractor->Delete();
     m_VtkInteractor = NULL;
   }
 }
 
 void mitk::VtkInteractorCameraController::Resize(int w, int h)
 {
   if(m_VtkInteractor)
     m_VtkInteractor->SetSize(w, h);
 }
 
 void mitk::VtkInteractorCameraController::MousePressEvent(mitk::MouseEvent *me)
 {
   MITK_INFO<<"Called MousePressEvent() in VtkInteractorCameraController. Seems to be obsolete after QVTK restructuring (bug #1503, bug #954)"<<std::endl;
   if(m_VtkInteractor)
   {
     if (!m_VtkInteractor->GetEnabled())
     {
       return;
     }
     int ctrl  = me->GetButtonState() & BS_ControlButton;
     int shift = me->GetButtonState() & BS_ShiftButton;
     int xp = (int)me->GetDisplayPosition()[0];
     int yp = (int)me->GetDisplayPosition()[1];
     m_VtkInteractor->SetEventInformationFlipY(xp, yp, ctrl, shift);
 
     switch (me->GetButton())
     {
     case BS_LeftButton:
       m_VtkInteractor->InvokeEvent(vtkCommand::LeftButtonPressEvent,NULL);
       break;
     case BS_MidButton:
       m_VtkInteractor->InvokeEvent(vtkCommand::MiddleButtonPressEvent,NULL);
       break;
     case BS_RightButton:
       m_VtkInteractor->InvokeEvent(vtkCommand::RightButtonPressEvent,NULL);
       break;
     default:
       return;
     }
   }
 }
 
 void mitk::VtkInteractorCameraController::MouseReleaseEvent(mitk::MouseEvent *me)
 {
   MITK_INFO<<"Called MouseReleaseEvent() in VtkInteractorCameraController. Seems to be obsolete after QVTK restructuring (bug #1503, bug #954)"<<std::endl;
   if(m_VtkInteractor)
   {
     if (!m_VtkInteractor->GetEnabled())
     {
       return;
     }
     int ctrl  = me->GetButtonState() & BS_ControlButton;
     int shift = me->GetButtonState() & BS_ShiftButton;
     int xp = (int)me->GetDisplayPosition()[0];
     int yp = (int)me->GetDisplayPosition()[1];
     m_VtkInteractor->SetEventInformationFlipY(xp, yp, ctrl, shift);
 
     switch (me->GetButton())
     {
     case BS_LeftButton:
       m_VtkInteractor->InvokeEvent(vtkCommand::LeftButtonReleaseEvent,NULL);
       break;
     case BS_MidButton:
       m_VtkInteractor->InvokeEvent(vtkCommand::MiddleButtonReleaseEvent,NULL);
       break;
     case BS_RightButton:
       m_VtkInteractor->InvokeEvent(vtkCommand::RightButtonReleaseEvent,NULL);
       break;
     default:
       return;
     }
   }
 }
 
 void mitk::VtkInteractorCameraController::MouseMoveEvent(mitk::MouseEvent *me)
 {
   MITK_INFO<<"Called MouseMoveEvent() in VtkInteractorCameraController. Seems to be obsolete after QVTK restructuring (bug #1503, bug #954)"<<std::endl;
   if(m_VtkInteractor)
   {
     if (!m_VtkInteractor->GetEnabled())
     {
       return;
     }
     int ctrl  = me->GetButtonState() & BS_ControlButton;
     int shift = me->GetButtonState() & BS_ShiftButton;
     int xp = (int)me->GetDisplayPosition()[0];
     int yp = (int)me->GetDisplayPosition()[1];
     m_VtkInteractor->SetEventInformationFlipY(xp, yp, ctrl, shift);
     m_VtkInteractor->InvokeEvent(vtkCommand::MouseMoveEvent, NULL);
   }
 }
 
 void mitk::VtkInteractorCameraController::KeyPressEvent(mitk::KeyEvent *ke)
 {
     MITK_INFO<<"Called KeyPressEvent() in VtkInteractorCameraController. Seems to be obsolete after QVTK restructuring (bug #1503, bug #954)"<<std::endl;
   if(m_VtkInteractor)
   {
     if (!m_VtkInteractor->GetEnabled())
     {
       return;
     }
     int ctrl  = ke->GetButtonState() & BS_ControlButton;
     int shift = ke->GetButtonState() & BS_ShiftButton;
     Point2D p(ke->GetDisplayPosition());
-    m_VtkInteractor->SetEventInformationFlipY(p[0], p[1], ctrl, shift, tolower(ke->GetText()[0]), 1, ke->GetText());
+    m_VtkInteractor->SetEventInformationFlipY(static_cast<int>(p[0]), static_cast<int>(p[1]), ctrl, shift, tolower(ke->GetText()[0]), 1, ke->GetText());
     m_VtkInteractor->InvokeEvent(vtkCommand::KeyPressEvent, NULL);
     m_VtkInteractor->InvokeEvent(vtkCommand::CharEvent, NULL);
   }
 }
 
 void mitk::VtkInteractorCameraController::SetRenderer(const mitk::BaseRenderer* renderer)
 {
   Superclass::SetRenderer(renderer);
   if (renderer)
   {
     // CHG 11-07: QVTK-Widget comes along with vtkRenderWindow and vtkRenWinInteractor, therefore do not 
     // generate a new one any more
     m_VtkInteractor = renderer->GetVtkRenderer()->GetRenderWindow()->GetInteractor();
     m_VtkInteractor->SetRenderWindow(renderer->GetVtkRenderer()->GetRenderWindow());
     // Enable possibility to (mouse-)interact with the renderer
     m_VtkInteractor->Enable();
     m_VtkInteractor->Register(NULL);
   }
 
   /*  VtkRenderWindowInteractor* windowInteractor =
       dynamic_cast<VtkRenderWindowInteractor*>(m_VtkInteractor);
     if (windowInteractor == NULL)
     {
       itkWarningMacro(<< "renderwindow is not an mitk::VtkRenderWindow");
     }
     else
     {
       windowInteractor->SetMitkRenderer(const_cast<mitk::BaseRenderer*>(this->GetRenderer()));
     }
     m_VtkInteractor->Initialize();
    
     m_VtkInteractor->SetRenderWindow(renderer->GetVtkRenderWindow());
    
   }
   else
   {
     m_VtkInteractor->SetRenderWindow(NULL);
     m_VtkInteractor->Delete();
     m_VtkInteractor = NULL;
   }*/
 }
 
 vtkRenderWindowInteractor* mitk::VtkInteractorCameraController::GetVtkInteractor()
 {
   return m_VtkInteractor;
 }
 
 ///*
 //bool mitk::VtkInteractorCameraController::ExecuteAction(Action*, mitk::StateEvent const * /*stateEvent*/
 //{
 //  return false;
 //}
 //*/
diff --git a/Core/Code/CppMicroServices/CMake/usFunctionCheckCompilerFlags.cmake b/Core/Code/CppMicroServices/CMake/usFunctionCheckCompilerFlags.cmake
index 9211f29df9..9c01709653 100644
--- a/Core/Code/CppMicroServices/CMake/usFunctionCheckCompilerFlags.cmake
+++ b/Core/Code/CppMicroServices/CMake/usFunctionCheckCompilerFlags.cmake
@@ -1,47 +1,47 @@
 #
 # Helper macro allowing to check if the given flags are supported 
 # by the underlying build tool
 #
 # If the flag(s) is/are supported, they will be appended to the string identified by RESULT_VAR
 #
 # Usage:
-#   MITKFunctionCheckCompilerFlags(FLAGS_TO_CHECK VALID_FLAGS_VAR)
+#   usFunctionCheckCompilerFlags(FLAGS_TO_CHECK VALID_FLAGS_VAR)
 #
 # Example:
 #
 #   set(myflags)
 #   usFunctionCheckCompilerFlags("-fprofile-arcs" myflags)
 #   message(1-myflags:${myflags})
 #   usFunctionCheckCompilerFlags("-fauto-bugfix" myflags)
 #   message(2-myflags:${myflags})
 #   usFunctionCheckCompilerFlags("-Wall" myflags)
 #   message(1-myflags:${myflags})
 #
 #   The output will be:
 #    1-myflags: -fprofile-arcs
 #    2-myflags: -fprofile-arcs
 #    3-myflags: -fprofile-arcs -Wall
 
 include(TestCXXAcceptsFlag)
 
 function(usFunctionCheckCompilerFlags CXX_FLAG_TO_TEST RESULT_VAR)
   
   if(CXX_FLAG_TO_TEST STREQUAL "")
     message(FATAL_ERROR "CXX_FLAG_TO_TEST shouldn't be empty")
   endif()
   
   # Internally, the macro CMAKE_CXX_ACCEPTS_FLAG calls TRY_COMPILE. To avoid
   # the cost of compiling the test each time the project is configured, the variable set by
   # the macro is added to the cache so that following invocation of the macro with
   # the same variable name skip the compilation step.
   # For that same reason, ctkFunctionCheckCompilerFlags function appends a unique suffix to
   # the HAS_FLAG variable. This suffix is created using a 'clean version' of the flag to test.
   string(REGEX REPLACE "-\\s\\$\\+\\*\\{\\}\\(\\)\\#" "" suffix ${CXX_FLAG_TO_TEST})
   CHECK_CXX_ACCEPTS_FLAG(${CXX_FLAG_TO_TEST} HAS_FLAG_${suffix})
 
   if(HAS_FLAG_${suffix})
     set(${RESULT_VAR} "${${RESULT_VAR}} ${CXX_FLAG_TO_TEST}" PARENT_SCOPE)
   endif()
 
 endfunction()
 
diff --git a/Core/Code/CppMicroServices/CMake/usFunctionCreateTestModule.cmake b/Core/Code/CppMicroServices/CMake/usFunctionCreateTestModule.cmake
index e67d034c75..babbf6afa0 100644
--- a/Core/Code/CppMicroServices/CMake/usFunctionCreateTestModule.cmake
+++ b/Core/Code/CppMicroServices/CMake/usFunctionCreateTestModule.cmake
@@ -1,15 +1,15 @@
 
 function(usFunctionCreateTestModule name)
 
   set(_srcs ${ARGN})
-  usFunctionGenerateModuleInit(_srcs NAME ${name})
+  usFunctionGenerateModuleInit(_srcs NAME "${name} Module" LIBRARY_NAME ${name})
 
   add_library(${name} ${_srcs})
   target_link_libraries(${name} ${US_LINK_LIBRARIES})
   if(NOT US_ENABLE_SERVICE_FACTORY_SUPPORT)
     target_link_libraries(${name} ${US_BASECLASS_LIBRARIES})
   endif()
 
   set(_us_test_module_libs "${_us_test_module_libs};${name}" CACHE INTERNAL "" FORCE)
   
 endfunction()
diff --git a/Core/Code/CppMicroServices/CMake/usFunctionGenerateModuleInit.cmake b/Core/Code/CppMicroServices/CMake/usFunctionGenerateModuleInit.cmake
index 55c4d98b9f..87a4ca4733 100644
--- a/Core/Code/CppMicroServices/CMake/usFunctionGenerateModuleInit.cmake
+++ b/Core/Code/CppMicroServices/CMake/usFunctionGenerateModuleInit.cmake
@@ -1,26 +1,71 @@
+#! Generate a source file which handles proper initialization of a module.
+#!
+#! This CMake function will store the path to a generated source file in the
+#! src_var variable, which should be compiled into a module. Example usage:
+#!
+#! \verbatim
+#! set(module_srcs )
+#! usFunctionGenerateModuleInit(module_srcs
+#!                              NAME "My Module"
+#!                              LIBRARY_NAME "mylib"
+#!                              VERSION "1.2.0"
+#!                             )
+#! add_library(mylib ${module_srcs})
+#! \endverbatim
+#!
+#! \param src_var (required) The name of a list variable to which the path of the generated
+#!        source file will be appended.
+#! \param NAME (required) A human-readable name for the module.
+#! \param LIBRARY_NAME (optional) The name of the module, without extension. If empty, the
+#!        NAME argument will be used.
+#! \param DEPENDS (optional) A string containing module dependencies.
+#! \param VERSION (optional) A version string for the module.
+#!
 function(usFunctionGenerateModuleInit src_var)
 
 MACRO_PARSE_ARGUMENTS(US_MODULE "NAME;LIBRARY_NAME;DEPENDS;VERSION" "EXECUTABLE" ${ARGN})
 
 # sanity checks
 if(NOT US_MODULE_NAME)
   message(SEND_ERROR "NAME argument is mandatory")
 endif()
 
+if(US_MODULE_EXECUTABLE AND US_MODULE_LIBRARY_NAME)
+  message("[Executable: ${US_MODULE_NAME}] Ignoring LIBRARY_NAME argument.")
+  set(US_MODULE_LIBRARY_NAME )
+endif()
+
 if(NOT US_MODULE_LIBRARY_NAME AND NOT US_MODULE_EXECUTABLE)
   set(US_MODULE_LIBRARY_NAME ${US_MODULE_NAME})
 endif()
 
+set(_regex_validation "[a-zA-Z-_][a-zA-Z-_0-9]*")
+if(US_MODULE_EXECUTABLE)
+  string(REGEX MATCH ${_regex_validation} _valid_chars ${US_MODULE_NAME})
+  if(NOT _valid_chars STREQUAL US_MODULE_NAME)
+    message(FATAL_ERROR "[Executable: ${US_MODULE_NAME}] MODULE_NAME contains illegal characters.")
+  endif()
+else()
+  string(REGEX MATCH ${_regex_validation} _valid_chars ${US_MODULE_LIBRARY_NAME})
+  if(NOT _valid_chars STREQUAL US_MODULE_LIBRARY_NAME)
+    message(FATAL_ERROR "[Module: ${US_MODULE_NAME}] LIBRARY_NAME \"${US_MODULE_LIBRARY_NAME}\" contains illegal characters.")
+  endif()
+endif()
+
 # Create variables of the ModuleInfo object, created in CMake/usModuleInit.cpp
 set(US_MODULE_DEPENDS_STR "")
 foreach(_dep ${US_MODULE_DEPENDS})
   set(US_MODULE_DEPENDS_STR "${US_MODULE_DEPENDS_STR} ${_dep}")
 endforeach()
 
-set(module_init_src_file "${CMAKE_CURRENT_BINARY_DIR}/${US_MODULE_NAME}_init.cpp")
+if(US_MODULE_LIBRARY_NAME)
+  set(module_init_src_file "${CMAKE_CURRENT_BINARY_DIR}/${US_MODULE_LIBRARY_NAME}_init.cpp")
+else()
+  set(module_init_src_file "${CMAKE_CURRENT_BINARY_DIR}/${US_MODULE_NAME}_init.cpp")
+endif()
 configure_file(${CppMicroServices_SOURCE_DIR}/CMake/usModuleInit.cpp ${module_init_src_file} @ONLY)
 
 set(_src ${${src_var}} ${module_init_src_file})
 set(${src_var} ${_src} PARENT_SCOPE)
 
 endfunction()
diff --git a/Core/Code/CppMicroServices/CMake/usModuleInit.cpp b/Core/Code/CppMicroServices/CMake/usModuleInit.cpp
index 6dd4dbb6b4..cb6bf187bb 100644
--- a/Core/Code/CppMicroServices/CMake/usModuleInit.cpp
+++ b/Core/Code/CppMicroServices/CMake/usModuleInit.cpp
@@ -1,84 +1,24 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
-#include <usStaticInit.h>
-
-#include <usModuleRegistry.h>
-#include <usModuleContext.h>
-#include <usModule.h>
-#include <usModuleInfo.h>
-#include <usModuleUtils.h>
-
-US_BEGIN_NAMESPACE
-
-US_GLOBAL_STATIC_WITH_ARGS(ModuleInfo, moduleInfo, ("@US_MODULE_NAME@", "@US_MODULE_LIBRARY_NAME@", "@US_MODULE_DEPENDS_STR@", "@US_MODULE_VERSION@"))
-
-class US_ABI_LOCAL ModuleInitializer {
-
-public:
-
-  ModuleInitializer()
-  {
-    std::string location = ModuleUtils::GetLibraryPath(moduleInfo()->libName, reinterpret_cast<void*>(moduleInfo));
-    std::string activator_func = "_us_module_activator_instance_";
-    activator_func.append(moduleInfo()->name);
-
-    moduleInfo()->location = location;
-
-    if (moduleInfo()->libName.empty())
-    {
-      // make sure we retrieve symbols from the executable, if "libName" is empty
-      location.clear();
-    }
-    moduleInfo()->activatorHook = reinterpret_cast<ModuleInfo::ModuleActivatorHook>(ModuleUtils::GetSymbol(location, activator_func.c_str()));
-
-    Register();
-  }
-
-  static void Register()
-  {
-    ModuleRegistry::Register(moduleInfo());
-  }
-
-  ~ModuleInitializer()
-  {
-    ModuleRegistry::UnRegister(moduleInfo());
-  }
-
-};
-
-ModuleContext* GetModuleContext()
-{
-  // make sure the module is registered
-  if (moduleInfo()->id == 0)
-  {
-    ModuleInitializer::Register();
-  }
-
-  return ModuleRegistry::GetModule(moduleInfo()->id)->GetModuleContext();
-}
-
-US_END_NAMESPACE
-
-static US_PREPEND_NAMESPACE(ModuleInitializer) coreModule;
-
-
+#include <usModuleInitialization.h>
 
+US_INITIALIZE_MODULE("@US_MODULE_NAME@", "@US_MODULE_LIBRARY_NAME@", "@US_MODULE_DEPENDS_STR@", "@US_MODULE_VERSION@")
diff --git a/Core/Code/CppMicroServices/CMakeLists.txt b/Core/Code/CppMicroServices/CMakeLists.txt
index 365af4f0b3..9fa225c51f 100644
--- a/Core/Code/CppMicroServices/CMakeLists.txt
+++ b/Core/Code/CppMicroServices/CMakeLists.txt
@@ -1,316 +1,322 @@
 project(CppMicroServices)
 
+set(${PROJECT_NAME}_MAJOR_VERSION 0)
+set(${PROJECT_NAME}_MINOR_VERSION 99)
+set(${PROJECT_NAME}_PATCH_VERSION 0)
+set(${PROJECT_NAME}_VERSION ${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}.${${PROJECT_NAME}_PATCH_VERSION})
+
 cmake_minimum_required(VERSION 2.8)
 
 #-----------------------------------------------------------------------------
 # Update CMake module path
 #------------------------------------------------------------------------------
 
 set(CMAKE_MODULE_PATH
   ${PROJECT_SOURCE_DIR}/CMake
   ${CMAKE_MODULE_PATH}
   )
 
 #-----------------------------------------------------------------------------
 # CMake function(s) and macro(s)
 #-----------------------------------------------------------------------------
 
 include(MacroParseArguments)
 include(CheckCXXSourceCompiles)
 include(usFunctionCheckCompilerFlags)
 include(usFunctionGetGccVersion)
 include(usFunctionGenerateModuleInit)
 
 #-----------------------------------------------------------------------------
 # Init output directories
 #-----------------------------------------------------------------------------
 
 set(US_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
 set(US_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
 set(US_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
 
 foreach(_type ARCHIVE LIBRARY RUNTIME)
   if(NOT CMAKE_${_type}_OUTPUT_DIRECTORY)
     set(CMAKE_${_type}_OUTPUT_DIRECTORY ${US_${_type}_OUTPUT_DIRECTORY})
   endif()
 endforeach()
 
 #-----------------------------------------------------------------------------
 # Set a default build type if none was specified
 #-----------------------------------------------------------------------------
 
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
   message(STATUS "Setting build type to 'Debug' as none was specified.")
   set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE)
 
   # Set the possible values of build type for cmake-gui
   set_property(CACHE CMAKE_BUILD_TYPE PROPERTY
                STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
 endif()
 
 #-----------------------------------------------------------------------------
 # CMake options
 #-----------------------------------------------------------------------------
 
 function(us_cache_var _var_name _var_default _var_type _var_help)
   set(_advanced 0)
   set(_force)
   foreach(_argn ${ARGN})
     if(_argn STREQUAL ADVANCED)
       set(_advanced 1)
     elseif(_argn STREQUAL FORCE)
       set(_force FORCE)
     endif()
   endforeach()
 
   if(US_IS_EMBEDDED)
     if(NOT DEFINED ${_var_name} OR _force)
       set(${_var_name} ${_var_default} PARENT_SCOPE)
     endif()
   else()
     set(${_var_name} ${_var_default} CACHE ${_var_type} "${_var_help}" ${_force})
     if(_advanced)
       mark_as_advanced(${_var_name})
     endif()
   endif()
 endfunction()
 
 # Determine if we are being build inside a larger project
 if(NOT DEFINED US_IS_EMBEDDED)
   if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
     set(US_IS_EMBEDDED 0)
   else()
     set(US_IS_EMBEDDED 1)
     set(CppMicroServices_EXPORTS 1)
   endif()
 endif()
 
 us_cache_var(US_ENABLE_SERVICE_FACTORY_SUPPORT ON BOOL "Enable Service Factory support" ADVANCED)
 us_cache_var(US_ENABLE_THREADING_SUPPORT OFF BOOL "Enable threading support")
 us_cache_var(US_BUILD_SHARED_LIBS ON BOOL "Build shared libraries")
 us_cache_var(US_BUILD_TESTING OFF BOOL "Build tests")
 
 if(MSVC10)
   # Visual Studio 2010 has support for C++11 enabled by default
   set(US_USE_C++11 1)
 else()
   us_cache_var(US_USE_C++11 OFF BOOL "Enable the use of C++11 features" ADVANCED)
 endif()
 
 us_cache_var(US_NAMESPACE "us" STRING "The namespace for the C++ micro services entities")
 us_cache_var(US_HEADER_PREFIX "" STRING "The file name prefix for the public C++ micro services header files")
 us_cache_var(US_BASECLASS_NAME "" STRING "The fully-qualified name of the base class")
 
 if(US_ENABLE_SERVICE_FACTORY_SUPPORT)
   us_cache_var(US_BASECLASS_PACKAGE "" STRING "The name of the package providing the base class definition" ADVANCED)
 
   set(bc_inc_d_doc "A list of include directories containing the header files for the base class")
   us_cache_var(US_BASECLASS_INCLUDE_DIRS "" STRING "${bc_inc_d_doc}" ADVANCED)
 
   set(bc_lib_d_doc "A list of library directories for the base class")
   us_cache_var(US_BASECLASS_LIBRARY_DIRS "" STRING "${bc_lib_d_doc}" ADVANCED)
 
   set(bc_lib_doc "A list of libraries needed for the base class")
   us_cache_var(US_BASECLASS_LIBRARIES "" STRING "${bc_lib_doc}" ADVANCED)
 
   us_cache_var(US_BASECLASS_HEADER "" STRING "The name of the header file containing the base class declaration" ADVANCED)
 endif()
 
 set(BUILD_SHARED_LIBS ${US_BUILD_SHARED_LIBS})
 
 # Sanity checks
 
 if(US_ENABLE_SERVICE_FACTORY_SUPPORT OR US_BUILD_TESTING)
   if(US_BASECLASS_PACKAGE)
     find_package(${US_BASECLASS_PACKAGE} REQUIRED)
 
     # Try to get the include dirs
     foreach(_suffix DIRECTORIES DIRS DIRECTORY DIR)
       if(${US_BASECLASS_PACKAGE}_INCLUDE_${_suffix} AND NOT US_BASECLASS_INCLUDE_DIRS)
-        us_cache_var(US_BASECLASS_INCLUDE_DIRS ${${US_BASECLASS_PACKAGE}_INCLUDE_${_suffix}} STRING "${bc_inc_d_doc}" FORCE)
+        us_cache_var(US_BASECLASS_INCLUDE_DIRS "${${US_BASECLASS_PACKAGE}_INCLUDE_${_suffix}}" STRING "${bc_inc_d_doc}" FORCE)
         break()
       endif()
     endforeach()
 
     # Try to get the library dirs
     foreach(_suffix DIRECTORIES DIRS DIRECTORY DIR)
       if(${US_BASECLASS_PACKAGE}_LIBRARY_${_suffix} AND NOT US_BASECLASS_LIBRARY_DIRS)
-        us_cache_var(US_BASECLASS_LIBRARY_DIRS ${${US_BASECLASS_PACKAGE}_LIBRARY_${_suffix}} STRING "${bc_lib_d_doc}" FORCE)
+        us_cache_var(US_BASECLASS_LIBRARY_DIRS "${${US_BASECLASS_PACKAGE}_LIBRARY_${_suffix}}" STRING "${bc_lib_d_doc}" FORCE)
         break()
       endif()
     endforeach()
 
     # Try to get the libraries
     foreach(_suffix LIBRARIES LIBS LIBRARY LIB)
       if(${US_BASECLASS_PACKAGE}_${_suffix} AND NOT US_BASECLASS_LIBRARIES)
-        us_cache_var(US_BASECLASS_LIBRARIES ${${US_BASECLASS_PACKAGE}_${_suffix}} STRING "${bc_lib_doc}" FORCE)
+        us_cache_var(US_BASECLASS_LIBRARIES "${${US_BASECLASS_PACKAGE}_${_suffix}}" STRING "${bc_lib_doc}" FORCE)
         break()
       endif()
     endforeach()
 
     if(NOT US_BASECLASS_NAME)
       message(FATAL_ERROR "US_BASECLASS_NAME not set")
     elseif(NOT US_BASECLASS_HEADER)
       message(FATAL_ERROR "US_BASECLASS_HEADER not set")
     endif()
   endif()
 
   if(US_ENABLE_SERVICE_FACTORY_SUPPORT AND US_BASECLASS_NAME AND NOT US_BASECLASS_HEADER)
     message(FATAL_ERROR "US_ENABLE_SERVICE_FACTORY_SUPPORT requires a US_BASECLASS_HEADER value")
   endif()
 endif()
 
 set(_us_baseclass_default 0)
 if(NOT US_BASECLASS_NAME)
   message(WARNING "Using build in base class \"::${US_NAMESPACE}::Base\"")
   set(_us_baseclass_default 1)
   set(US_BASECLASS_NAME "${US_NAMESPACE}::Base")
   set(US_BASECLASS_HEADER "usBase.h")
 endif()
 
 if(US_BUILD_TESTING AND US_BASECLASS_NAME AND NOT US_BASECLASS_HEADER)
   message(FATAL_ERROR "US_BUILD_TESTING requires a US_BASECLASS_HEADER value")
 endif()
 
 set(US_BASECLASS_INCLUDE "#include <${US_BASECLASS_HEADER}>")
 
 string(REPLACE "::" ";" _bc_token "${US_BASECLASS_NAME}")
 list(GET _bc_token -1 _bc_name)
 list(REMOVE_AT _bc_token -1)
 
 set(US_BASECLASS_FORWARD_DECLARATION "")
 foreach(_namespace_tok ${_bc_token})
   if(_namespace_tok)
     set(US_BASECLASS_FORWARD_DECLARATION "${US_BASECLASS_FORWARD_DECLARATION}namespace ${_namespace_tok} { ")
   endif()
 endforeach()
 set(US_BASECLASS_FORWARD_DECLARATION "${US_BASECLASS_FORWARD_DECLARATION}class ${_bc_name}; ")
 foreach(_namespace_tok ${_bc_token})
   if(_namespace_tok)
     set(US_BASECLASS_FORWARD_DECLARATION "${US_BASECLASS_FORWARD_DECLARATION}}")
   endif()
 endforeach()
 
 #-----------------------------------------------------------------------------
 # US C/CXX Flags
 #-----------------------------------------------------------------------------
 
 set(US_C_FLAGS "${COVERAGE_C_FLAGS} ${ADDITIONAL_C_FLAGS}")
 set(US_CXX_FLAGS "${COVERAGE_CXX_FLAGS} ${ADDITIONAL_CXX_FLAGS}")
 
 # This is used as a preprocessor define
 set(US_USE_CXX11 ${US_USE_C++11})
 
 if(CMAKE_COMPILER_IS_GNUCXX)
   set(cflags "-Wall -Wextra -Wpointer-arith -Winvalid-pch -Wcast-align -Wwrite-strings -D_FORTIFY_SOURCE=2")
 
   usFunctionCheckCompilerFlags("-fdiagnostics-show-option" cflags)
   usFunctionCheckCompilerFlags("-Wl,--no-undefined" cflags)
 
   if(US_USE_C++11)
     usFunctionCheckCompilerFlags("-std=c++0x" US_CXX_FLAGS)
   endif()
 
   usFunctionGetGccVersion(${CMAKE_CXX_COMPILER} GCC_VERSION)
 
   # With older version of gcc supporting the flag -fstack-protector-all, an extra dependency to libssp.so
   # is introduced. If gcc is smaller than 4.4.0 and the build type is Release let's not include the flag.
   # Doing so should allow to build package made for distribution using older linux distro.
   if(${GCC_VERSION} VERSION_GREATER "4.4.0" OR (CMAKE_BUILD_TYPE STREQUAL "Debug" AND ${GCC_VERSION} VERSION_LESS "4.4.0"))
     usFunctionCheckCompilerFlags("-fstack-protector-all" cflags)
   endif()
 
   if(MINGW)
     # suppress warnings about auto imported symbols
     set(US_CXX_FLAGS "-Wl,--enable-auto-import ${US_CXX_FLAGS}")
     # we need to define a Windows version
     set(US_CXX_FLAGS "-D_WIN32_WINNT=0x0500 ${US_CXX_FLAGS}")
   else()
     # Enable visibility support
     if(NOT ${GCC_VERSION} VERSION_LESS "4.5")
       usFunctionCheckCompilerFlags("-fvisibility=hidden -fvisibility-inlines-hidden" US_CXX_FLAGS)
     endif()
   endif()
 
   set(US_C_FLAGS "${cflags} ${US_C_FLAGS}")
   set(US_CXX_FLAGS "${cflags} -Woverloaded-virtual -Wold-style-cast -Wstrict-null-sentinel -Wsign-promo ${US_CXX_FLAGS}")
 elseif(MSVC90 OR MSVC10)
   set(US_CXX_FLAGS "/MP ${US_CXX_FLAGS}")
 endif()
 
 if(NOT US_IS_EMBEDDED)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${US_CXX_FLAGS}")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${US_C_FLAGS}")
 endif()
 
 #-----------------------------------------------------------------------------
 # US include dirs and libraries
 #-----------------------------------------------------------------------------
 
 set(US_INCLUDE_DIRS
   ${PROJECT_BINARY_DIR}/include
 )
 
 set(US_INTERNAL_INCLUDE_DIRS
   ${PROJECT_BINARY_DIR}/include
   ${CMAKE_CURRENT_SOURCE_DIR}/src/util
   ${CMAKE_CURRENT_SOURCE_DIR}/src/service
   ${CMAKE_CURRENT_SOURCE_DIR}/src/module
 )
 
 if(US_ENABLE_SERVICE_FACTORY_SUPPORT)
-  list(APPEND _us_internal_include_dirs ${US_BASECLASS_INCLUDE_DIRS})
+  list(APPEND US_INTERNAL_INCLUDE_DIRS ${US_BASECLASS_INCLUDE_DIRS})
 endif()
 
 # link libraries for third party libs
 if(US_IS_EMBEDDED)
   set(US_LINK_LIBRARIES ${US_EMBEDDING_LIBRARY})
 else()
   set(US_LINK_LIBRARIES ${PROJECT_NAME})
 endif()
 
 # link libraries for the CppMicroServices lib
 set(_link_libraries )
 if(UNIX)
   list(APPEND _link_libraries dl)
 endif()
 list(APPEND US_LINK_LIBRARIES ${_link_libraries})
 
 if(US_ENABLE_SERVICE_FACTORY_SUPPORT)
   list(APPEND US_LINK_LIBRARIES ${US_BASECLASS_LIBRARIES})
 endif()
 
 set(US_LINK_DIRS )
 if(US_ENABLE_SERVICE_FACTORY_SUPPORT)
   list(APPEND US_LINK_DIRS ${US_BASECLASS_LIBRARY_DIRS})
 endif()
 
 #-----------------------------------------------------------------------------
 # Source directory
 #-----------------------------------------------------------------------------
 
+set(us_config_h_file "${PROJECT_BINARY_DIR}/include/usConfig.h")
+configure_file(usConfig.h.in ${us_config_h_file})
+
 add_subdirectory(src)
 
 #-----------------------------------------------------------------------------
 # US testing
 #-----------------------------------------------------------------------------
 
 if(US_BUILD_TESTING)
   enable_testing()
   add_subdirectory(test)
 endif()
 
 #-----------------------------------------------------------------------------
 # Documentation
 #-----------------------------------------------------------------------------
 
 add_subdirectory(documentation)
 
 #-----------------------------------------------------------------------------
 # Last configuration steps
 #-----------------------------------------------------------------------------
 
-configure_file(usConfig.h.in ${PROJECT_BINARY_DIR}/include/usConfig.h)
-
 configure_file(${PROJECT_NAME}Config.cmake.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake @ONLY)
 
diff --git a/Core/Code/CppMicroServices/README.md b/Core/Code/CppMicroServices/README.md
new file mode 100644
index 0000000000..dd47f2e310
--- /dev/null
+++ b/Core/Code/CppMicroServices/README.md
@@ -0,0 +1,81 @@
+C++ Micro Services
+==================
+
+Introduction
+------------
+
+The C++ Micro Services library provides a dynamic service registry based on the
+service layer as specified in the OSGi R4.2 specifications. It enables users to
+realize a service oriented approach within their software stack.
+
+The advantages include higher reuse of components, looser coupling, better organization of
+responsibilities, cleaner API contracts, etc.
+
+Requirements
+------------
+
+This is a pure C++ implementation of the OSGi service model and does not have any third-party
+library dependencies.
+
+Supported Platforms
+-------------------
+
+The library should compile on many different platforms. Below is a list of tested compiler/OS combinations:
+
+  - GCC 4.5 (Ubuntu 11.04 and MacOS X 10.6)
+  - Visual Studio 2008 and 2010
+  - Clang 3.0 (Ubuntu 11.04 and MacOS X 10.6)
+  
+Quick Start
+-----------
+
+Essentially, the C++ Micro Services library provides you with a powerful dynamic service registry.
+Each shared or static library has an associated `ModuleContext` object, through which the service
+registry is accessed.
+
+To query the registry for a service object implementing one or more specific interfaces, the code
+would look like this:
+
+```cpp
+#include <usModuleContext.h>
+#include <someInterface.h>
+
+using namespace us;
+
+void UseService(ModuleContext* context)
+{
+  ServiceReference serviceRef = context->GetServiceReference<SomeInterface>();
+  if (serviceRef)
+  {
+    SomeInterface* service = context->GetService<SomeInterface>(serviceRef);
+    if (service) { /* do something */ }
+  }
+}
+```
+
+Registering a service object against a certain interface looks like this:
+
+```cpp
+#include <usModuleContext.h>
+#include <someInterface.h>
+
+using namespace us;
+
+void RegisterSomeService(ModuleContext* context, SomeInterface* service)
+{
+  context->RegisterService<SomeInterface>(service);
+}
+```
+
+The OSGi service model additionally allows to annotate services with properties and using these
+properties during service look-ups. It also allows to track the life-cycle of service objects.
+Please see the [Documentation](http://cppmicroservices.org/doc_latest/index.html) for more
+examples and tutorials and the API reference. There is also a blog post about
+[OSGi Lite for C++](http://blog.cppmicroservices.org/2012/04/15/osgi-lite-for-c++).
+
+Build Instructions
+------------------
+
+Please visit the [Build Instructions][bi_master] page online.
+
+[bi_master]: http://cppmicroservices.org/doc_latest/BuildInstructions.html
diff --git a/Core/Code/CppMicroServices/documentation/CMakeLists.txt b/Core/Code/CppMicroServices/documentation/CMakeLists.txt
index cde8b91f7c..8ce17b7663 100644
--- a/Core/Code/CppMicroServices/documentation/CMakeLists.txt
+++ b/Core/Code/CppMicroServices/documentation/CMakeLists.txt
@@ -1,37 +1,65 @@
 
 if(US_BUILD_TESTING)
   include(usFunctionCompileSnippets)
   # Compile source code snippets
   add_subdirectory(snippets)
 endif()
 
 if(NOT US_IS_EMBEDDED)
   find_package(Doxygen)
 
   if(DOXYGEN_FOUND)
+  
+    option(US_DOCUMENTATION_FOR_WEBPAGE "Build Doxygen documentation for the webpage" OFF)
+    set(US_DOXYGEN_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH "Doxygen output directory")
+    mark_as_advanced(US_DOCUMENTATION_FOR_WEBPAGE US_DOXYGEN_OUTPUT_DIR)
 
     set(US_HAVE_DOT "NO")
     if(DOXYGEN_DOT_EXECUTABLE)
       set(US_HAVE_DOT "YES")
     endif()
 
     if(NOT DEFINED US_DOXYGEN_DOT_NUM_THREADS)
       set(US_DOXYGEN_DOT_NUM_THREADS 4)
     endif()
     
-    if(US_IS_EMBEDDED)
-      set(US_DOXYGEN_MAIN_PAGE_CMD "\\page \\1")
+    # We are in standalone mode, so we generate a "mainpage"
+    set(US_DOXYGEN_MAIN_PAGE_CMD "\\mainpage")
+    set(US_DOXYGEN_ENABLED_SECTIONS "us_standalone")
+    
+    if(US_DOCUMENTATION_FOR_WEBPAGE)
+      configure_file(doxygen/header.html
+                     ${CMAKE_CURRENT_BINARY_DIR}/header.html COPY_ONLY)
+      set(US_DOXYGEN_HEADER header.html)
+
+      configure_file(doxygen/footer.html
+                     ${CMAKE_CURRENT_BINARY_DIR}/footer.html COPY_ONLY)
+      set(US_DOXYGEN_FOOTER footer.html)
+
+      configure_file(doxygen/doxygen.css
+                     ${CMAKE_CURRENT_BINARY_DIR}/doxygen.css COPY_ONLY)
+      set(US_DOXYGEN_CSS doxygen.css)
+      
+      set(US_DOXYGEN_OUTPUT_DIR ${PROJECT_SOURCE_DIR}/gh-pages)
+      if(${PROJECT_NAME}_MINOR_VERSION EQUAL 99)
+        set(US_DOXYGEN_HTML_OUTPUT "doc_latest")
+      else()
+        set(US_DOXYGEN_HTML_OUTPUT "doc_${${PROJECT_NAME}_MAJOR_VERSION}_${${PROJECT_NAME}_MINOR_VERSION}")
+      endif()
     else()
-      set(US_DOXYGEN_MAIN_PAGE_CMD "\\mainpage")
+      set(US_DOXYGEN_HEADER )
+      set(US_DOXYGEN_FOOTER )
+      set(US_DOXYGEN_CSS )
+      set(US_DOXYGEN_HTML_OUTPUT "html")
     endif()
-
+    
     configure_file(doxygen.conf.in
                    ${CMAKE_CURRENT_BINARY_DIR}/doxygen.conf)
 
     add_custom_target(doc
                       ${DOXYGEN} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.conf
                       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
                       )
   endif()
 endif()
 
diff --git a/Core/Code/CppMicroServices/documentation/doxygen.conf.in b/Core/Code/CppMicroServices/documentation/doxygen.conf.in
index 11c18184e0..d2a37838d6 100644
--- a/Core/Code/CppMicroServices/documentation/doxygen.conf.in
+++ b/Core/Code/CppMicroServices/documentation/doxygen.conf.in
@@ -1,1765 +1,1803 @@
-# Doxyfile 1.7.5.1
+# Doxyfile 1.8.0-20120408
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
 #
 # All text after a hash (#) is considered a comment and will be ignored.
 # The format is:
 #       TAG = value [value, ...]
 # For lists items can also be appended using:
 #       TAG += value [value, ...]
 # Values that contain spaces should be placed between quotes (" ").
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
 
 # This tag specifies the encoding used for all characters in the config file
 # that follow. The default is UTF-8 which is also the encoding used for all
 # text before the first occurrence of this tag. Doxygen uses libiconv (or the
 # iconv built into libc) for the transcoding. See
 # http://www.gnu.org/software/libiconv for the list of possible encodings.
 
 DOXYFILE_ENCODING      = UTF-8
 
 # The PROJECT_NAME tag is a single word (or sequence of words) that should
 # identify the project. Note that if you do not use Doxywizard you need
 # to put quotes around the project name if it contains spaces.
 
 PROJECT_NAME           = "C++ Micro Services"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.99
+PROJECT_NUMBER         = @CppMicroServices_VERSION@
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer
 # a quick idea about the purpose of the project. Keep the description short.
 
 PROJECT_BRIEF          = "A dynamic OSGi-like C++ service registry"
 
 # With the PROJECT_LOGO tag one can specify an logo or icon that is
 # included in the documentation. The maximum height of the logo should not
 # exceed 55 pixels and the maximum width should not exceed 200 pixels.
 # Doxygen will copy the logo to the output directory.
 
 PROJECT_LOGO           =
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = @PROJECT_BINARY_DIR@/documentation
+OUTPUT_DIRECTORY       = @US_DOXYGEN_OUTPUT_DIR@
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
 # format and will distribute the generated files over these directories.
 # Enabling this option can be useful when feeding doxygen a huge amount of
 # source files, where putting all generated files in the same directory would
 # otherwise cause performance problems for the file system.
 
 CREATE_SUBDIRS         = NO
 
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
 # The default language is English, other supported languages are:
 # Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
 # Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
 # Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
 # messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
 # Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
 # Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
 
 OUTPUT_LANGUAGE        = English
 
 # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
 # include brief member descriptions after the members that are listed in
 # the file and class documentation (similar to JavaDoc).
 # Set to NO to disable this.
 
 BRIEF_MEMBER_DESC      = YES
 
 # If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
 # the brief description of a member or function before the detailed description.
 # Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
 # brief descriptions will be completely suppressed.
 
 REPEAT_BRIEF           = YES
 
 # This tag implements a quasi-intelligent brief description abbreviator
 # that is used to form the text in various listings. Each string
 # in this list, if found as the leading text of the brief description, will be
 # stripped from the text and the result after processing the whole list, is
 # used as the annotated text. Otherwise, the brief description is used as-is.
 # If left blank, the following values are used ("$name" is automatically
 # replaced with the name of the entity): "The $name class" "The $name widget"
 # "The $name file" "is" "provides" "specifies" "contains"
 # "represents" "a" "an" "the"
 
 ABBREVIATE_BRIEF       =
 
 # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
 # Doxygen will generate a detailed section even if there is only a brief
 # description.
 
 ALWAYS_DETAILED_SEC    = NO
 
 # If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
 # inherited members of a class in the documentation of that class as if those
 # members were ordinary class members. Constructors, destructors and assignment
 # operators of the base classes will not be shown.
 
 INLINE_INHERITED_MEMB  = NO
 
 # If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
 # path before files name in the file list and in the header files. If set
 # to NO the shortest path that makes the file name unique will be used.
 
 FULL_PATH_NAMES        = NO
 
 # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
 # can be used to strip a user-defined part of the path. Stripping is
 # only done if one of the specified strings matches the left-hand part of
 # the path. The tag can be used to show relative paths in the file list.
 # If left blank the directory from which doxygen is run is used as the
 # path to strip.
 
 STRIP_FROM_PATH        =
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
 # the path mentioned in the documentation of a class, which tells
 # the reader which header file to include in order to use a class.
 # If left blank only the name of the header file containing the class
 # definition is used. Otherwise one should specify the include paths that
 # are normally passed to the compiler using the -I flag.
 
 STRIP_FROM_INC_PATH    =
 
 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
 # (but less readable) file names. This can be useful if your file system
 # doesn't support long names like on DOS, Mac, or CD-ROM.
 
 SHORT_NAMES            = NO
 
 # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
 # will interpret the first line (until the first dot) of a JavaDoc-style
 # comment as the brief description. If set to NO, the JavaDoc
 # comments will behave just like regular Qt-style comments
 # (thus requiring an explicit @brief command for a brief description.)
 
 JAVADOC_AUTOBRIEF      = NO
 
 # If the QT_AUTOBRIEF tag is set to YES then Doxygen will
 # interpret the first line (until the first dot) of a Qt-style
 # comment as the brief description. If set to NO, the comments
 # will behave just like regular Qt-style comments (thus requiring
 # an explicit \brief command for a brief description.)
 
 QT_AUTOBRIEF           = NO
 
 # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
 # treat a multi-line C++ special comment block (i.e. a block of //! or ///
 # comments) as a brief description. This used to be the default behaviour.
 # The new default is to treat a multi-line C++ comment block as a detailed
 # description. Set this tag to YES if you prefer the old behaviour instead.
 
 MULTILINE_CPP_IS_BRIEF = NO
 
 # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
 # member inherits the documentation from any documented member that it
 # re-implements.
 
 INHERIT_DOCS           = YES
 
 # If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
 # a new page for each member. If set to NO, the documentation of a member will
 # be part of the file/class/namespace that contains it.
 
 SEPARATE_MEMBER_PAGES  = NO
 
 # The TAB_SIZE tag can be used to set the number of spaces in a tab.
 # Doxygen uses this value to replace tabs by spaces in code fragments.
 
 TAB_SIZE               = 2
 
 # This tag can be used to specify a number of aliases that acts
 # as commands in the documentation. An alias has the form "name=value".
 # For example adding "sideeffect=\par Side Effects:\n" will allow you to
 # put the command \sideeffect (or @sideeffect) in the documentation, which
 # will result in a user-defined paragraph with heading "Side Effects:".
 # You can put \n's in the value part of an alias to insert newlines.
 
 ALIASES                = "FIXME=\par Fix Me's:\n" \
                          "embmainpage{1}=@US_DOXYGEN_MAIN_PAGE_CMD@"
 
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding
+# "class=itcl::class" will allow you to use the command class in the
+# itcl::class meaning.
+
+TCL_SUBST              =
+
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
 # sources only. Doxygen will then generate output that is more tailored for C.
 # For instance, some of the names that are used will be different. The list
 # of all members will be omitted, etc.
 
 OPTIMIZE_OUTPUT_FOR_C  = NO
 
 # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
 # sources only. Doxygen will then generate output that is more tailored for
 # Java. For instance, namespaces will be presented as packages, qualified
 # scopes will look different, etc.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
 # Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
 # sources only. Doxygen will then generate output that is more tailored for
 # Fortran.
 
 OPTIMIZE_FOR_FORTRAN   = NO
 
 # Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
 # sources. Doxygen will then generate output that is tailored for
 # VHDL.
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
 # Doxygen selects the parser to use depending on the extension of the files it
 # parses. With this tag you can assign which parser to use for a given extension.
 # Doxygen has a built-in mapping, but you can override or extend it using this
 # tag. The format is ext=language, where ext is a file extension, and language
 # is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
 # C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
 # doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
 # (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
 # you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
 
 EXTENSION_MAPPING      =
 
+# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
+# comments according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you
+# can mix doxygen, HTML, and XML commands with Markdown formatting.
+# Disable only in case of backward compatibilities issues.
+
+MARKDOWN_SUPPORT       = YES
+
 # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
 # to include (a tag file for) the STL sources as input, then you should
 # set this tag to YES in order to let doxygen match functions declarations and
 # definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
 # func(std::string) {}). This also makes the inheritance and collaboration
 # diagrams that involve STL classes more complete and accurate.
 
 BUILTIN_STL_SUPPORT    = YES
 
 # If you use Microsoft's C++/CLI language, you should set this option to YES to
 # enable parsing support.
 
 CPP_CLI_SUPPORT        = NO
 
 # Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
 # Doxygen will parse them like normal C++ but will assume all classes use public
 # instead of private inheritance when no explicit protection keyword is present.
 
 SIP_SUPPORT            = NO
 
 # For Microsoft's IDL there are propget and propput attributes to indicate getter
 # and setter methods for a property. Setting this option to YES (the default)
 # will make doxygen replace the get and set methods by a property in the
 # documentation. This will only work if the methods are indeed getting or
 # setting a simple type. If this is not the case, or you want to show the
 # methods anyway, you should set this option to NO.
 
 IDL_PROPERTY_SUPPORT   = YES
 
 # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
 # tag is set to YES, then doxygen will reuse the documentation of the first
 # member in the group (if any) for the other members of the group. By default
 # all members of a group must be documented explicitly.
 
 DISTRIBUTE_GROUP_DOC   = NO
 
 # Set the SUBGROUPING tag to YES (the default) to allow class member groups of
 # the same type (for instance a group of public functions) to be put as a
 # subgroup of that type (e.g. under the Public Functions section). Set it to
 # NO to prevent subgrouping. Alternatively, this can be done per class using
 # the \nosubgrouping command.
 
 SUBGROUPING            = YES
 
 # When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
 # unions are shown inside the group in which they are included (e.g. using
 # @ingroup) instead of on a separate page (for HTML and Man pages) or
 # section (for LaTeX and RTF).
 
 INLINE_GROUPED_CLASSES = NO
 
 # When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
 # unions with only public data fields will be shown inline in the documentation
 # of the scope in which they are defined (i.e. file, namespace, or group
 # documentation), provided this scope is documented. If set to NO (the default),
 # structs, classes, and unions are shown on a separate page (for HTML and Man
 # pages) or section (for LaTeX and RTF).
 
 INLINE_SIMPLE_STRUCTS  = NO
 
 # When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
 # is documented as struct, union, or enum with the name of the typedef. So
 # typedef struct TypeS {} TypeT, will appear in the documentation as a struct
 # with name TypeT. When disabled the typedef will appear as a member of a file,
 # namespace, or class. And the struct will be named TypeS. This can typically
 # be useful for C code in case the coding convention dictates that all compound
 # types are typedef'ed and only the typedef is referenced, never the tag name.
 
 TYPEDEF_HIDES_STRUCT   = NO
 
 # The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
 # determine which symbols to keep in memory and which to flush to disk.
 # When the cache is full, less often used symbols will be written to disk.
 # For small to medium size projects (<1000 input files) the default value is
 # probably good enough. For larger projects a too small cache size can cause
 # doxygen to be busy swapping symbols to and from disk most of the time
 # causing a significant performance penalty.
 # If the system has enough physical memory increasing the cache will improve the
 # performance by keeping more symbols in memory. Note that the value works on
 # a logarithmic scale so increasing the size by one will roughly double the
 # memory usage. The cache size is given by this formula:
 # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols
+# corresponding to a cache size of 2^16 = 65536 symbols.
 
 SYMBOL_CACHE_SIZE      = 0
 
+# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
+# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
+# their name and scope. Since this can be an expensive process and often the
+# same symbol appear multiple times in the code, doxygen keeps a cache of
+# pre-resolved symbols. If the cache is too small doxygen will become slower.
+# If the cache is too large, memory is wasted. The cache size is given by this
+# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+LOOKUP_CACHE_SIZE      = 0
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
 
 # If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
 # documentation are documented, even if no documentation was available.
 # Private class members and static file members will be hidden unless
 # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
 
 EXTRACT_ALL            = YES
 
 # If the EXTRACT_PRIVATE tag is set to YES all private members of a class
 # will be included in the documentation.
 
 EXTRACT_PRIVATE        = NO
 
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal scope will be included in the documentation.
+
+EXTRACT_PACKAGE        = NO
+
 # If the EXTRACT_STATIC tag is set to YES all static members of a file
 # will be included in the documentation.
 
 EXTRACT_STATIC         = YES
 
 # If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
 # defined locally in source files will be included in the documentation.
 # If set to NO only classes defined in header files are included.
 
 EXTRACT_LOCAL_CLASSES  = NO
 
 # This flag is only useful for Objective-C code. When set to YES local
 # methods, which are defined in the implementation section but not in
 # the interface are included in the documentation.
 # If set to NO (the default) only methods in the interface are included.
 
 EXTRACT_LOCAL_METHODS  = NO
 
 # If this flag is set to YES, the members of anonymous namespaces will be
 # extracted and appear in the documentation as a namespace called
 # 'anonymous_namespace{file}', where file will be replaced with the base
 # name of the file that contains the anonymous namespace. By default
 # anonymous namespaces are hidden.
 
 EXTRACT_ANON_NSPACES   = NO
 
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
 # undocumented members of documented classes, files or namespaces.
 # If set to NO (the default) these members will be included in the
 # various overviews, but no documentation section is generated.
 # This option has no effect if EXTRACT_ALL is enabled.
 
 HIDE_UNDOC_MEMBERS     = NO
 
 # If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
 # undocumented classes that are normally visible in the class hierarchy.
 # If set to NO (the default) these classes will be included in the various
 # overviews. This option has no effect if EXTRACT_ALL is enabled.
 
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
 # friend (class|struct|union) declarations.
 # If set to NO (the default) these declarations will be included in the
 # documentation.
 
-HIDE_FRIEND_COMPOUNDS  = @MITK_DOXYGEN_HIDE_FRIEND_COMPOUNDS@
+HIDE_FRIEND_COMPOUNDS  = YES
 
 # If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
 # documentation blocks found inside the body of a function.
 # If set to NO (the default) these blocks will be appended to the
 # function's detailed documentation block.
 
 HIDE_IN_BODY_DOCS      = NO
 
 # The INTERNAL_DOCS tag determines if documentation
 # that is typed after a \internal command is included. If the tag is set
 # to NO (the default) then the documentation will be excluded.
 # Set it to YES to include the internal documentation.
 
 INTERNAL_DOCS          = NO
 
 # If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
 # file names in lower-case letters. If set to YES upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
 # and Mac users are advised to set this option to NO.
 
 CASE_SENSE_NAMES       = YES
 
 # If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
 # will show members with their full class and namespace scopes in the
 # documentation. If set to YES the scope will be hidden.
 
 HIDE_SCOPE_NAMES       = NO
 
 # If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
 # will put a list of the files that are included by a file in the documentation
 # of that file.
 
 SHOW_INCLUDE_FILES     = NO
 
 # If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
 # will list include files with double quotes in the documentation
 # rather than with sharp brackets.
 
 FORCE_LOCAL_INCLUDES   = NO
 
 # If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
 # is inserted in the documentation for inline members.
 
 INLINE_INFO            = YES
 
 # If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
 # will sort the (detailed) documentation of file and class members
 # alphabetically by member name. If set to NO the members will appear in
 # declaration order.
 
 SORT_MEMBER_DOCS       = YES
 
 # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
 # brief documentation of file, namespace and class members alphabetically
 # by member name. If set to NO (the default) the members will appear in
 # declaration order.
 
 SORT_BRIEF_DOCS        = NO
 
 # If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
 # will sort the (brief and detailed) documentation of class members so that
 # constructors and destructors are listed first. If set to NO (the default)
 # the constructors will appear in the respective orders defined by
 # SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
 # This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
 # and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
 
 SORT_MEMBERS_CTORS_1ST = NO
 
 # If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
 # hierarchy of group names into alphabetical order. If set to NO (the default)
 # the group names will appear in their defined order.
 
 SORT_GROUP_NAMES       = NO
 
 # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
 # sorted by fully-qualified names, including namespaces. If set to
 # NO (the default), the class list will be sorted only by class name,
 # not including the namespace part.
 # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
 # Note: This option applies only to the class list, not to the
 # alphabetical list.
 
 SORT_BY_SCOPE_NAME     = YES
 
 # If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
 # do proper type resolution of all parameters of a function it will reject a
 # match between the prototype and the implementation of a member function even
 # if there is only one candidate or it is obvious which candidate to choose
 # by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
 # will still accept a match between prototype and implementation in such cases.
 
 STRICT_PROTO_MATCHING  = NO
 
 # The GENERATE_TODOLIST tag can be used to enable (YES) or
 # disable (NO) the todo list. This list is created by putting \todo
 # commands in the documentation.
 
 GENERATE_TODOLIST      = YES
 
 # The GENERATE_TESTLIST tag can be used to enable (YES) or
 # disable (NO) the test list. This list is created by putting \test
 # commands in the documentation.
 
 GENERATE_TESTLIST      = YES
 
 # The GENERATE_BUGLIST tag can be used to enable (YES) or
 # disable (NO) the bug list. This list is created by putting \bug
 # commands in the documentation.
 
 GENERATE_BUGLIST       = YES
 
 # The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
 # disable (NO) the deprecated list. This list is created by putting
 # \deprecated commands in the documentation.
 
 GENERATE_DEPRECATEDLIST= YES
 
 # The ENABLED_SECTIONS tag can be used to enable conditional
 # documentation sections, marked by \if sectionname ... \endif.
 
-ENABLED_SECTIONS       = 
+ENABLED_SECTIONS       = @US_DOXYGEN_ENABLED_SECTIONS@
 
 # The MAX_INITIALIZER_LINES tag determines the maximum number of lines
 # the initial value of a variable or macro consists of for it to appear in
 # the documentation. If the initializer consists of more lines than specified
 # here it will be hidden. Use a value of 0 to hide initializers completely.
 # The appearance of the initializer of individual variables and macros in the
 # documentation can be controlled using \showinitializer or \hideinitializer
 # command in the documentation regardless of this setting.
 
 MAX_INITIALIZER_LINES  = 0
 
 # Set the SHOW_USED_FILES tag to NO to disable the list of files generated
 # at the bottom of the documentation of classes and structs. If set to YES the
 # list will mention the files that were used to generate the documentation.
 
 SHOW_USED_FILES        = NO
 
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = NO
-
 # Set the SHOW_FILES tag to NO to disable the generation of the Files page.
 # This will remove the Files entry from the Quick Index and from the
 # Folder Tree View (if specified). The default is YES.
 
 SHOW_FILES             = NO
 
 # Set the SHOW_NAMESPACES tag to NO to disable the generation of the
 # Namespaces page.
 # This will remove the Namespaces entry from the Quick Index
 # and from the Folder Tree View (if specified). The default is YES.
 
-SHOW_NAMESPACES        = NO
+SHOW_NAMESPACES        = YES
 
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that
 # doxygen should invoke to get the current version for each file (typically from
 # the version control system). Doxygen will invoke the program by executing (via
 # popen()) the command <command> <input-file>, where <command> is the value of
 # the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
 # provided by doxygen. Whatever the program writes to standard output
 # is used as the file version. See the manual for examples.
 
 FILE_VERSION_FILTER    =
 
 # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
 # by doxygen. The layout file controls the global structure of the generated
 # output files in an output format independent way. The create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option.
 # You can optionally specify a file name after the option, if omitted
 # DoxygenLayout.xml will be used as the name of the layout file.
 
 LAYOUT_FILE            =
 
 # The CITE_BIB_FILES tag can be used to specify one or more bib files
 # containing the references data. This must be a list of .bib files. The
 # .bib extension is automatically appended if omitted. Using this command
 # requires the bibtex tool to be installed. See also
 # http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
-# of the bibliography can be controlled using LATEX_BIB_STYLE.
+# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
+# feature you need bibtex and perl available in the search path.
 
 CITE_BIB_FILES         =
 
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
 # The QUIET tag can be used to turn on/off the messages that are generated
 # by doxygen. Possible values are YES and NO. If left blank NO is used.
 
 QUIET                  = NO
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
 # generated by doxygen. Possible values are YES and NO. If left blank
 # NO is used.
 
 WARNINGS               = YES
 
 # If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
 # for undocumented members. If EXTRACT_ALL is set to YES then this flag will
 # automatically be disabled.
 
 WARN_IF_UNDOCUMENTED   = YES
 
 # If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
 # potential errors in the documentation, such as not documenting some
 # parameters in a documented function, or documenting parameters that
 # don't exist or using markup commands wrongly.
 
 WARN_IF_DOC_ERROR      = YES
 
 # The WARN_NO_PARAMDOC option can be enabled to get warnings for
 # functions that are documented, but have no documentation for their parameters
 # or return value. If set to NO (the default) doxygen will only warn about
 # wrong or incomplete parameter documentation, but not about the absence of
 # documentation.
 
 WARN_NO_PARAMDOC       = NO
 
 # The WARN_FORMAT tag determines the format of the warning messages that
 # doxygen can produce. The string should contain the $file, $line, and $text
 # tags, which will be replaced by the file and line number from which the
 # warning originated and the warning text. Optionally the format may contain
 # $version, which will be replaced by the version of the file (if it could
 # be obtained via FILE_VERSION_FILTER)
 
 WARN_FORMAT            = "$file:$line: $text"
 
 # The WARN_LOGFILE tag can be used to specify a file to which warning
 # and error messages should be written. If left blank the output is written
 # to stderr.
 
 WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 
 # The INPUT tag can be used to specify the files and/or directories that contain
 # documented source files. You may enter file names like "myfile.cpp" or
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = @PROJECT_SOURCE_DIR@
+INPUT                  = @PROJECT_SOURCE_DIR@ \
+                         @PROJECT_BINARY_DIR@/include/usConfig.h
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
 # also the default input encoding. Doxygen uses libiconv (or the iconv built
 # into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
 # the list of possible encodings.
 
 INPUT_ENCODING         = UTF-8
 
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
 # and *.h) to filter out the source-files in the directories. If left
 # blank the following patterns are tested:
 # *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
 # *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
 # *.f90 *.f *.for *.vhd *.vhdl
 
 FILE_PATTERNS          = *.h \
-                         *.cpp \
                          *.dox \
-                         *.txx \
-                         *.tpp \
-                         *.cxx \
-                         *.cmake
+                         *.md
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories
 # should be searched for input files as well. Possible values are YES and NO.
 # If left blank NO is used.
 
 RECURSIVE              = YES
 
-# The EXCLUDE tag can be used to specify files and/or directories that should
+# The EXCLUDE tag can be used to specify files and/or directories that should be
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
-# Note that relative paths are relative to directory from which doxygen is run.
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
 
-EXCLUDE                = @PROJECT_SOURCE_DIR@/documentation/snippets/ \
-                         @PROJECT_SOURCE_DIR@/test/
+EXCLUDE                = @PROJECT_SOURCE_DIR@/README.md \
+                         @PROJECT_SOURCE_DIR@/documentation/snippets/ \
+                         @PROJECT_SOURCE_DIR@/test/ \
+                         @PROJECT_SOURCE_DIR@/gh-pages \
+                         @PROJECT_SOURCE_DIR@/.git/
 
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
 # from the input.
 
 EXCLUDE_SYMLINKS       = NO
 
 # If the value of the INPUT tag contains directories, you can use the
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
 # certain files from those directories. Note that the wildcards are matched
 # against the file with absolute path, so to exclude all test directories
 # for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = */.git/*
+EXCLUDE_PATTERNS       = */.git/* \
+                         *_p.h \
+                         *Private.*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
 # output. The symbol name can be a fully qualified name, a word, or if the
 # wildcard * is used, a substring. Examples: ANamespace, AClass,
 # AClass::ANamespace, ANamespace::*Test
 
 EXCLUDE_SYMBOLS        =
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or
 # directories that contain example code fragments that are included (see
 # the \include command).
 
 EXAMPLE_PATH           = @PROJECT_SOURCE_DIR@/documentation/snippets/
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
 # and *.h) to filter out the source-files in the directories. If left
 # blank all files are included.
 
 EXAMPLE_PATTERNS       =
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
 # searched for input files to be used with the \include or \dontinclude
 # commands irrespective of the value of the RECURSIVE tag.
 # Possible values are YES and NO. If left blank NO is used.
 
 EXAMPLE_RECURSIVE      = YES
 
 # The IMAGE_PATH tag can be used to specify one or more files or
 # directories that contain image that are included in the documentation (see
 # the \image command).
 
-IMAGE_PATH             = 
+IMAGE_PATH             =
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
 # by executing (via popen()) the command <filter> <input-file>, where <filter>
 # is the value of the INPUT_FILTER tag, and <input-file> is the name of an
 # input file. Doxygen will then use the output that the filter program writes
 # to standard output.
 # If FILTER_PATTERNS is specified, this tag will be
 # ignored.
 
 INPUT_FILTER           =
 
 # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
 # basis.
 # Doxygen will compare the file name with each pattern and apply the
 # filter if there is a match.
 # The filters are a list of the form:
 # pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
 # info on how filters are used. If FILTER_PATTERNS is empty or if
 # non of the patterns match the file name, INPUT_FILTER is applied.
 
-FILTER_PATTERNS        = 
+FILTER_PATTERNS        =
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
 # INPUT_FILTER) will be used to filter the input files when producing source
 # files to browse (i.e. when SOURCE_BROWSER is set to YES).
 
 FILTER_SOURCE_FILES    = NO
 
 # The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
 # pattern. A pattern will override the setting for FILTER_PATTERN (if any)
 # and it is also possible to disable source filtering for a specific pattern
 # using *.ext= (so without naming a filter). This option only has effect when
 # FILTER_SOURCE_FILES is enabled.
 
 FILTER_SOURCE_PATTERNS =
 
 #---------------------------------------------------------------------------
 # configuration options related to source browsing
 #---------------------------------------------------------------------------
 
 # If the SOURCE_BROWSER tag is set to YES then a list of source files will
 # be generated. Documented entities will be cross-referenced with these sources.
 # Note: To get rid of all source code in the generated output, make sure also
 # VERBATIM_HEADERS is set to NO.
 
 SOURCE_BROWSER         = NO
 
 # Setting the INLINE_SOURCES tag to YES will include the body
 # of functions and classes directly in the documentation.
 
 INLINE_SOURCES         = NO
 
 # Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
 # doxygen to hide any special comment blocks from generated source code
 # fragments. Normal C and C++ comments will always remain visible.
 
 STRIP_CODE_COMMENTS    = YES
 
 # If the REFERENCED_BY_RELATION tag is set to YES
 # then for each documented function all documented
 # functions referencing it will be listed.
 
 REFERENCED_BY_RELATION = YES
 
 # If the REFERENCES_RELATION tag is set to YES
 # then for each documented function all documented entities
 # called/used by that function will be listed.
 
 REFERENCES_RELATION    = YES
 
 # If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
 # and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
 # functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
 # link to the source code.
 # Otherwise they will link to the documentation.
 
 REFERENCES_LINK_SOURCE = YES
 
 # If the USE_HTAGS tag is set to YES then the references to source code
 # will point to the HTML generated by the htags(1) tool instead of doxygen
 # built-in source browser. The htags tool is part of GNU's global source
 # tagging system (see http://www.gnu.org/software/global/global.html). You
 # will need version 4.8.6 or higher.
 
 USE_HTAGS              = NO
 
 # If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
 # will generate a verbatim copy of the header file for each class for
 # which an include is specified. Set to NO to disable this.
 
-VERBATIM_HEADERS       = YES
+VERBATIM_HEADERS       = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 
 # If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
 # of all compounds will be generated. Enable this if the project
 # contains a lot of classes, structs, unions or interfaces.
 
 ALPHABETICAL_INDEX     = YES
 
 # If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
 # the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
 # in which this list will be split (can be a number in the range [1..20])
 
 COLS_IN_ALPHA_INDEX    = 3
 
 # In case all classes in a project start with a common prefix, all
 # classes will be put under the same header in the alphabetical index.
 # The IGNORE_PREFIX tag can be used to specify one or more prefixes that
 # should be ignored while generating the index headers.
 
 IGNORE_PREFIX          =
 
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_HTML tag is set to YES (the default) Doxygen will
 # generate HTML output.
 
 GENERATE_HTML          = YES
 
 # The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `html' will be used as the default path.
 
-HTML_OUTPUT            = html
+HTML_OUTPUT            = @US_DOXYGEN_HTML_OUTPUT@
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for
 # each generated HTML page (for example: .htm,.php,.asp). If it is left blank
 # doxygen will generate files with .html extension.
 
 HTML_FILE_EXTENSION    = .html
 
 # The HTML_HEADER tag can be used to specify a personal HTML header for
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard header. Note that when using a custom header you are responsible
 #  for the proper inclusion of any scripts and style sheets that doxygen
 # needs, which is dependent on the configuration options used.
-# It is adviced to generate a default header using "doxygen -w html
+# It is advised to generate a default header using "doxygen -w html
 # header.html footer.html stylesheet.css YourConfigFile" and then modify
 # that header. Note that the header is subject to change so you typically
 # have to redo this when upgrading to a newer version of doxygen or when
 # changing the value of configuration settings such as GENERATE_TREEVIEW!
 
-HTML_HEADER            =
+HTML_HEADER            = @US_DOXYGEN_HEADER@
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard footer.
 
-HTML_FOOTER            =
+HTML_FOOTER            = @US_DOXYGEN_FOOTER@
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
 # style sheet that is used by each HTML page. It can be used to
 # fine-tune the look of the HTML output. If the tag is left blank doxygen
 # will generate a default style sheet. Note that doxygen will try to copy
 # the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
+# style sheet in the HTML output directory as well, or it will be erased!
 
-HTML_STYLESHEET        =
+HTML_STYLESHEET        = @US_DOXYGEN_CSS@
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
 # that these files will be copied to the base HTML output directory. Use the
 # $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
 # files. In the HTML_STYLESHEET file, use the file name only. Also note that
 # the files will be copied as-is; there are no commands or markers available.
 
 HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
-# Doxygen will adjust the colors in the stylesheet and background images
+# Doxygen will adjust the colors in the style sheet and background images
 # according to this color. Hue is specified as an angle on a colorwheel,
 # see http://en.wikipedia.org/wiki/Hue for more information.
 # For instance the value 0 represents red, 60 is yellow, 120 is green,
 # 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
 # The allowed range is 0 to 359.
 
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
 # the colors in the HTML output. For a value of 0 the output will use
 # grayscales only. A value of 255 will produce the most vivid colors.
 
 HTML_COLORSTYLE_SAT    = 100
 
 # The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
 # the luminance component of the colors in the HTML output. Values below
 # 100 gradually make the output lighter, whereas values above 100 make
 # the output darker. The value divided by 100 is the actual gamma applied,
 # so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
 # and 100 does not change the gamma.
 
 HTML_COLORSTYLE_GAMMA  = 80
 
 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
 # page will contain the date and time when the page was generated. Setting
 # this to NO can help when comparing the output of multiple runs.
 
 HTML_TIMESTAMP         = YES
 
 # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
 # files or namespaces will be aligned in HTML using tables. If set to
 # NO a bullet list will be used.
 
 HTML_ALIGN_MEMBERS     = YES
 
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
 # page has loaded. For this to work a browser that supports
 # JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
 # Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
 
 HTML_DYNAMIC_SECTIONS  = NO
 
 # If the GENERATE_DOCSET tag is set to YES, additional index files
 # will be generated that can be used as input for Apple's Xcode 3
 # integrated development environment, introduced with OSX 10.5 (Leopard).
 # To create a documentation set, doxygen will generate a Makefile in the
 # HTML output directory. Running make will produce the docset in that
 # directory and running "make install" will install the docset in
 # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
 # it at startup.
 # See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
 # for more information.
 
 GENERATE_DOCSET        = NO
 
 # When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
 # feed. A documentation feed provides an umbrella under which multiple
 # documentation sets from a single provider (such as a company or product suite)
 # can be grouped.
 
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 
 # When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
 # should uniquely identify the documentation set bundle. This should be a
 # reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
 # will append .docset to the name.
 
 DOCSET_BUNDLE_ID       = org.doxygen.Project
 
 # When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
 # the documentation publisher. This should be a reverse domain-name style
 # string, e.g. com.mycompany.MyDocSet.documentation.
 
 DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
 
 # The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
 
 DOCSET_PUBLISHER_NAME  = Publisher
 
 # If the GENERATE_HTMLHELP tag is set to YES, additional index files
 # will be generated that can be used as input for tools like the
 # Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
 # of the generated HTML documentation.
 
 GENERATE_HTMLHELP      = NO
 
 # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
 # be used to specify the file name of the resulting .chm file. You
 # can add a path in front of the file if the result should not be
 # written to the html output directory.
 
 CHM_FILE               =
 
 # If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
 # be used to specify the location (absolute path including file name) of
 # the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
 # the HTML help compiler on the generated index.hhp.
 
 HHC_LOCATION           =
 
 # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
 # controls if a separate .chi index file is generated (YES) or that
 # it should be included in the master .chm file (NO).
 
 GENERATE_CHI           = NO
 
 # If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
 # is used to encode HtmlHelp index (hhk), content (hhc) and project file
 # content.
 
 CHM_INDEX_ENCODING     =
 
 # If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
 # controls whether a binary table of contents is generated (YES) or a
 # normal table of contents (NO) in the .chm file.
 
 BINARY_TOC             = NO
 
 # The TOC_EXPAND flag can be set to YES to add extra items for group members
 # to the contents of the HTML help documentation and to the tree view.
 
 TOC_EXPAND             = NO
 
 # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
 # QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
 # that can be used as input for Qt's qhelpgenerator to generate a
 # Qt Compressed Help (.qch) of the generated HTML documentation.
 
 GENERATE_QHP           = NO
 
 # If the QHG_LOCATION tag is specified, the QCH_FILE tag can
 # be used to specify the file name of the resulting .qch file.
 # The path specified is relative to the HTML output folder.
 
 QCH_FILE               =
 
 # The QHP_NAMESPACE tag specifies the namespace to use when generating
 # Qt Help Project output. For more information please see
 # http://doc.trolltech.com/qthelpproject.html#namespace
 
 QHP_NAMESPACE          =
 
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
 # Qt Help Project output. For more information please see
 # http://doc.trolltech.com/qthelpproject.html#virtual-folders
 
 QHP_VIRTUAL_FOLDER     =
 
 # If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
 # add. For more information please see
 # http://doc.trolltech.com/qthelpproject.html#custom-filters
 
 QHP_CUST_FILTER_NAME   =
 
 # The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
 # custom filter to add. For more information please see
 # <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
 # Qt Help Project / Custom Filters</a>.
 
 QHP_CUST_FILTER_ATTRS  =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
 # project's
 # filter section matches.
 # <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
 # Qt Help Project / Filter Attributes</a>.
 
 QHP_SECT_FILTER_ATTRS  =
 
 # If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
 # be used to specify the location of Qt's qhelpgenerator.
 # If non-empty doxygen will try to run qhelpgenerator on the generated
 # .qhp file.
 
 QHG_LOCATION           =
 
 # If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
 #  will be generated, which together with the HTML files, form an Eclipse help
 # plugin. To install this plugin and make it available under the help contents
 # menu in Eclipse, the contents of the directory containing the HTML and XML
 # files needs to be copied into the plugins directory of eclipse. The name of
 # the directory within the plugins directory should be the same as
 # the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
 # the help appears.
 
 GENERATE_ECLIPSEHELP   = NO
 
 # A unique identifier for the eclipse help plugin. When installing the plugin
 # the directory name containing the HTML and XML files should also have
 # this name.
 
 ECLIPSE_DOC_ID         = org.doxygen.Project
 
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
+# at top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it. Since the tabs have the same information as the
+# navigation tree you can set this option to NO if you already set
+# GENERATE_TREEVIEW to YES.
 
 DISABLE_INDEX          = NO
 
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
-# (range [0,1..20]) that doxygen will group on one line in the generated HTML
-# documentation. Note that a value of 0 will completely suppress the enum
-# values from appearing in the overview section.
-
-ENUM_VALUES_PER_LINE   = 4
-
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
 # structure should be generated to display hierarchical information.
 # If the tag value is set to YES, a side panel will be generated
 # containing a tree-like index structure (just like the one that
 # is generated for HTML Help). For this to work a browser that supports
 # JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
 # Windows users are probably better off using the HTML help feature.
+# Since the tree basically has the same information as the tab index you
+# could consider to set DISABLE_INDEX to NO when enabling this option.
 
-GENERATE_TREEVIEW      = YES
+GENERATE_TREEVIEW      = NO
 
-# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
-# and Class Hierarchy pages using a tree view instead of an ordered list.
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
+# (range [0,1..20]) that doxygen will group on one line in the generated HTML
+# documentation. Note that a value of 0 will completely suppress the enum
+# values from appearing in the overview section.
 
-USE_INLINE_TREES       = NO
+ENUM_VALUES_PER_LINE   = 4
 
 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
 # used to set the initial width (in pixels) of the frame in which the tree
 # is shown.
 
 TREEVIEW_WIDTH         = 300
 
 # When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
 # links to external symbols imported via tag files in a separate window.
 
 EXT_LINKS_IN_WINDOW    = NO
 
 # Use this tag to change the font size of Latex formulas included
 # as images in the HTML documentation. The default is 10. Note that
 # when you change the font size after a successful doxygen run you need
 # to manually remove any form_*.png images from the HTML output directory
 # to force them to be regenerated.
 
 FORMULA_FONTSIZE       = 10
 
 # Use the FORMULA_TRANPARENT tag to determine whether or not the images
 # generated for formulas are transparent PNGs. Transparent PNGs are
 # not supported properly for IE 6.0, but are supported on all modern browsers.
 # Note that when changing this option you need to delete any form_*.png files
 # in the HTML output before the changes have effect.
 
 FORMULA_TRANSPARENT    = YES
 
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
 # (see http://www.mathjax.org) which uses client side Javascript for the
 # rendering instead of using prerendered bitmaps. Use this if you do not
 # have LaTeX installed or if you want to formulas look prettier in the HTML
-# output. When enabled you also need to install MathJax separately and
+# output. When enabled you may also need to install MathJax separately and
 # configure the path to it using the MATHJAX_RELPATH option.
 
 USE_MATHJAX            = NO
 
 # When MathJax is enabled you need to specify the location relative to the
 # HTML output directory using the MATHJAX_RELPATH option. The destination
 # directory should contain the MathJax.js script. For instance, if the mathjax
 # directory is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the
-# mathjax.org site, so you can quickly see the result without installing
-# MathJax, but it is strongly recommended to install a local copy of MathJax
-# before deployment.
+# MATHJAX_RELPATH should be ../mathjax. The default value points to
+# the MathJax Content Delivery Network so you can quickly see the result without
+# installing MathJax.
+# However, it is strongly recommended to install a local
+# copy of MathJax from http://www.mathjax.org before deployment.
 
 MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
 # names that should be enabled during MathJax rendering.
 
 MATHJAX_EXTENSIONS     =
 
 # When the SEARCHENGINE tag is enabled doxygen will generate a search box
 # for the HTML output. The underlying search engine uses javascript
 # and DHTML and should work on any modern browser. Note that when using
 # HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
 # (GENERATE_DOCSET) there is already a search function so this one should
 # typically be disabled. For large projects the javascript based search engine
 # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
 
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
 # implemented using a PHP enabled web server instead of at the web client
 # using Javascript. Doxygen will generate the search PHP script and index
 # file to put on the web server. The advantage of the server
 # based approach is that it scales better to large projects and allows
 # full text search. The disadvantages are that it is more difficult to setup
 # and does not have live searching capabilities.
 
 SERVER_BASED_SEARCH    = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
 # generate Latex output.
 
 GENERATE_LATEX         = NO
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `latex' will be used as the default path.
 
 LATEX_OUTPUT           = latex
 
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
 # invoked. If left blank `latex' will be used as the default command name.
 # Note that when enabling USE_PDFLATEX this option is only used for
 # generating bitmaps for formulas in the HTML output, but not in the
 # Makefile that is written to the output directory.
 
 LATEX_CMD_NAME         = latex
 
 # The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
 # generate index for LaTeX. If left blank `makeindex' will be used as the
 # default command name.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
 # If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
 # LaTeX documents. This may be useful for small projects and may help to
 # save some trees in general.
 
 COMPACT_LATEX          = NO
 
 # The PAPER_TYPE tag can be used to set the paper type that is used
 # by the printer. Possible values are: a4, letter, legal and
 # executive. If left blank a4wide will be used.
 
 PAPER_TYPE             = a4wide
 
 # The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
 # packages that should be included in the LaTeX output.
 
 EXTRA_PACKAGES         = amssymb
 
 # The LATEX_HEADER tag can be used to specify a personal LaTeX header for
 # the generated latex document. The header should contain everything until
 # the first chapter. If it is left blank doxygen will generate a
 # standard header. Notice: only use this tag if you know what you are doing!
 
 LATEX_HEADER           =
 
 # The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
 # the generated latex document. The footer should contain everything after
 # the last chapter. If it is left blank doxygen will generate a
 # standard footer. Notice: only use this tag if you know what you are doing!
 
 LATEX_FOOTER           =
 
 # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
 # is prepared for conversion to pdf (using ps2pdf). The pdf file will
 # contain links (just like the HTML output) instead of page references
 # This makes the output suitable for online browsing using a pdf viewer.
 
 PDF_HYPERLINKS         = NO
 
 # If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
 # plain latex in the generated Makefile. Set this option to YES to get a
 # higher quality PDF documentation.
 
 USE_PDFLATEX           = NO
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
 # command to the generated LaTeX files. This will instruct LaTeX to keep
 # running if errors occur, instead of asking the user for help.
 # This option is also used when generating formulas in HTML.
 
 LATEX_BATCHMODE        = NO
 
 # If LATEX_HIDE_INDICES is set to YES then doxygen will not
 # include the index chapters (such as File Index, Compound Index, etc.)
 # in the output.
 
 LATEX_HIDE_INDICES     = NO
 
 # If LATEX_SOURCE_CODE is set to YES then doxygen will include
 # source code with syntax highlighting in the LaTeX output.
 # Note that which sources are shown also depends on other settings
 # such as SOURCE_BROWSER.
 
 LATEX_SOURCE_CODE      = NO
 
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
 # http://en.wikipedia.org/wiki/BibTeX for more info.
 
 LATEX_BIB_STYLE        = plain
 
 #---------------------------------------------------------------------------
 # configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
 # The RTF output is optimized for Word 97 and may not look very pretty with
 # other RTF readers or editors.
 
 GENERATE_RTF           = NO
 
 # The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `rtf' will be used as the default path.
 
 RTF_OUTPUT             = rtf
 
 # If the COMPACT_RTF tag is set to YES Doxygen generates more compact
 # RTF documents. This may be useful for small projects and may help to
 # save some trees in general.
 
 COMPACT_RTF            = NO
 
 # If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
 # will contain hyperlink fields. The RTF file will
 # contain links (just like the HTML output) instead of page references.
 # This makes the output suitable for online browsing using WORD or other
 # programs which support those fields.
 # Note: wordpad (write) and others do not support links.
 
 RTF_HYPERLINKS         = NO
 
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# Load style sheet definitions from file. Syntax is similar to doxygen's
 # config file, i.e. a series of assignments. You only have to provide
 # replacements, missing definitions are set to their default value.
 
 RTF_STYLESHEET_FILE    =
 
 # Set optional variables used in the generation of an rtf document.
 # Syntax is similar to doxygen's config file.
 
 RTF_EXTENSIONS_FILE    =
 
 #---------------------------------------------------------------------------
 # configuration options related to the man page output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_MAN tag is set to YES (the default) Doxygen will
 # generate man pages
 
 GENERATE_MAN           = NO
 
 # The MAN_OUTPUT tag is used to specify where the man pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `man' will be used as the default path.
 
 MAN_OUTPUT             = man
 
 # The MAN_EXTENSION tag determines the extension that is added to
 # the generated man pages (default is the subroutine's section .3)
 
 MAN_EXTENSION          = .3
 
 # If the MAN_LINKS tag is set to YES and Doxygen generates man output,
 # then it will generate one additional man file for each entity
 # documented in the real man page(s). These additional files
 # only source the real man page, but without them the man command
 # would be unable to find the correct page. The default is NO.
 
 MAN_LINKS              = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the XML output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_XML tag is set to YES Doxygen will
 # generate an XML file that captures the structure of
 # the code including all documentation.
 
 GENERATE_XML           = NO
 
 # The XML_OUTPUT tag is used to specify where the XML pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `xml' will be used as the default path.
 
 XML_OUTPUT             = xml
 
 # The XML_SCHEMA tag can be used to specify an XML schema,
 # which can be used by a validating XML parser to check the
 # syntax of the XML files.
 
 XML_SCHEMA             =
 
 # The XML_DTD tag can be used to specify an XML DTD,
 # which can be used by a validating XML parser to check the
 # syntax of the XML files.
 
 XML_DTD                =
 
 # If the XML_PROGRAMLISTING tag is set to YES Doxygen will
 # dump the program listings (including syntax highlighting
 # and cross-referencing information) to the XML output. Note that
 # enabling this will significantly increase the size of the XML output.
 
 XML_PROGRAMLISTING     = YES
 
 #---------------------------------------------------------------------------
 # configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
 # generate an AutoGen Definitions (see autogen.sf.net) file
 # that captures the structure of the code including all
 # documentation. Note that this feature is still experimental
 # and incomplete at the moment.
 
 GENERATE_AUTOGEN_DEF   = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_PERLMOD tag is set to YES Doxygen will
 # generate a Perl module file that captures the structure of
 # the code including all documentation. Note that this
 # feature is still experimental and incomplete at the
 # moment.
 
 GENERATE_PERLMOD       = NO
 
 # If the PERLMOD_LATEX tag is set to YES Doxygen will generate
 # the necessary Makefile rules, Perl scripts and LaTeX code to be able
 # to generate PDF and DVI output from the Perl module output.
 
 PERLMOD_LATEX          = NO
 
 # If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
 # nicely formatted so it can be parsed by a human reader.
 # This is useful
 # if you want to understand what is going on.
 # On the other hand, if this
 # tag is set to NO the size of the Perl module output will be much smaller
 # and Perl will parse it just the same.
 
 PERLMOD_PRETTY         = YES
 
 # The names of the make variables in the generated doxyrules.make file
 # are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
 # This is useful so different doxyrules.make files included by the same
 # Makefile don't overwrite each other's variables.
 
 PERLMOD_MAKEVAR_PREFIX =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
 # If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
 # evaluate all C-preprocessor directives found in the sources and include
 # files.
 
 ENABLE_PREPROCESSING   = YES
 
 # If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
 # names in the source code. If set to NO (the default) only conditional
 # compilation will be performed. Macro expansion can be done in a controlled
 # way by setting EXPAND_ONLY_PREDEF to YES.
 
 MACRO_EXPANSION        = YES
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
 # then the macro expansion is limited to the macros specified with the
 # PREDEFINED and EXPAND_AS_DEFINED tags.
 
 EXPAND_ONLY_PREDEF     = YES
 
 # If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
 # pointed to by INCLUDE_PATH will be searched when a #include is found.
 
 SEARCH_INCLUDES        = YES
 
 # The INCLUDE_PATH tag can be used to specify one or more directories that
 # contain include files that are not input files but should be processed by
 # the preprocessor.
 
 INCLUDE_PATH           = @PROJECT_BINARY_DIR@/include/
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the
 # directories. If left blank, the patterns specified with FILE_PATTERNS will
 # be used.
 
 INCLUDE_FILE_PATTERNS  = *.h
 
 # The PREDEFINED tag can be used to specify one or more macro names that
 # are defined before the preprocessor is started (similar to the -D option of
 # gcc). The argument of the tag is a list of macros of the form: name
 # or name=definition (no spaces). If the definition and the = are
 # omitted =1 is assumed. To prevent a macro definition from being
 # undefined via #undef or recursively expanded use the := operator
 # instead of the = operator.
 
-PREDEFINED             = 
+PREDEFINED             = US_PREPEND_NAMESPACE(x)=x \
+                         US_BEGIN_NAMESPACE= \
+                         US_END_NAMESPACE= \
+                         "US_BASECLASS_NAME=@US_BASECLASS_NAME@" \
+                         US_EXPORT=
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
 # this tag can be used to specify a list of macro names that should be expanded.
 # The macro definition that is found in the sources will be used.
 # Use the PREDEFINED tag if you want to use a different macro definition that
 # overrules the definition found in the source code.
 
-EXPAND_AS_DEFINED      = US_BASECLASS_NAME
+EXPAND_AS_DEFINED      =
 
 # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
 # doxygen's preprocessor will remove all references to function-like macros
 # that are alone on a line, have an all uppercase name, and do not end with a
 # semicolon, because these will confuse the parser if not removed.
 
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
+# The TAGFILES option can be used to specify one or more tagfiles. For each
+# tag file the location of the external documentation should be added. The
+# format of a tag file without this location is as follows:
 #
 # TAGFILES = file1 file2 ...
 # Adding location for the tag files is done as follows:
 #
 # TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
+# where "loc1" and "loc2" can be relative or absolute paths
+# or URLs. Note that each tag file must have a unique name (where the name does
+# NOT include the path). If a tag file is not located in the directory in which
+# doxygen is run, you must also specify the path to the tagfile here.
 
-TAGFILES               = 
+TAGFILES               =
 
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create
 # a tag file that is based on the input files it reads.
 
-GENERATE_TAGFILE       = 
+GENERATE_TAGFILE       =
 
 # If the ALLEXTERNALS tag is set to YES all external classes will be listed
 # in the class index. If set to NO only the inherited external classes
 # will be listed.
 
 ALLEXTERNALS           = NO
 
 # If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
 # in the modules index. If set to NO, only the current project's groups will
 # be listed.
 
 EXTERNAL_GROUPS        = NO
 
 # The PERL_PATH should be the absolute path and name of the perl script
 # interpreter (i.e. the result of `which perl').
 
 PERL_PATH              = /usr/bin/perl
 
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
 # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
 # generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
 # or super classes. Setting the tag to NO turns the diagrams off. Note that
 # this option also works with HAVE_DOT disabled, but it is recommended to
 # install and use dot, since it yields more powerful graphs.
 
 CLASS_DIAGRAMS         = YES
 
 # You can define message sequence charts within doxygen comments using the \msc
 # command. Doxygen will then run the mscgen tool (see
 # http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
 # documentation. The MSCGEN_PATH tag allows you to specify the directory where
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
 MSCGEN_PATH            =
 
 # If set to YES, the inheritance and collaboration graphs will hide
 # inheritance and usage relations if the target is undocumented
 # or is not a class.
 
 HIDE_UNDOC_RELATIONS   = YES
 
 # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
 # available from the path. This tool is part of Graphviz, a graph visualization
 # toolkit from AT&T and Lucent Bell Labs. The other options in this section
 # have no effect if this option is set to NO (the default)
 
 HAVE_DOT               = @US_HAVE_DOT@
 
 # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
 # allowed to run in parallel. When set to 0 (the default) doxygen will
 # base this on the number of processors available in the system. You can set it
 # explicitly to a value larger than 0 to get control over the balance
 # between CPU load and processing speed.
 
 DOT_NUM_THREADS        = @US_DOXYGEN_DOT_NUM_THREADS@
 
 # By default doxygen will use the Helvetica font for all dot files that
 # doxygen generates. When you want a differently looking font you can specify
 # the font name using DOT_FONTNAME. You need to make sure dot is able to find
 # the font, which can be done by putting it in a standard location or by setting
 # the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
 # directory containing the font.
 
 DOT_FONTNAME           = FreeSans.ttf
 
 # The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
 # The default size is 10pt.
 
 DOT_FONTSIZE           = 10
 
 # By default doxygen will tell dot to use the Helvetica font.
 # If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
 # set the path where dot can find it.
 
 DOT_FONTPATH           =
 
 # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
 # will generate a graph for each documented class showing the direct and
 # indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
+# CLASS_DIAGRAMS tag to NO.
 
 CLASS_GRAPH            = YES
 
 # If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
 # will generate a graph for each documented class showing the direct and
 # indirect implementation dependencies (inheritance, containment, and
 # class references variables) of the class with other documented classes.
 
 COLLABORATION_GRAPH    = YES
 
 # If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
 # will generate a graph for groups, showing the direct groups dependencies
 
 GROUP_GRAPHS           = YES
 
 # If the UML_LOOK tag is set to YES doxygen will generate inheritance and
 # collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
 
 UML_LOOK               = NO
 
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside
+# the class node. If there are many fields or methods and many nodes the
+# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
+# threshold limits the number of items for each type to make the size more
+# managable. Set this to 0 for no limit. Note that the threshold may be
+# exceeded by 50% before the limit is enforced.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
 # If set to YES, the inheritance and collaboration graphs will show the
 # relations between templates and their instances.
 
 TEMPLATE_RELATIONS     = YES
 
 # If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
 # tags are set to YES then doxygen will generate a graph for each documented
 # file showing the direct and indirect include dependencies of the file with
 # other documented files.
 
 INCLUDE_GRAPH          = NO
 
 # If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
 # HAVE_DOT tags are set to YES then doxygen will generate a graph for each
 # documented header file showing the documented files that directly or
 # indirectly include this file.
 
 INCLUDED_BY_GRAPH      = NO
 
 # If the CALL_GRAPH and HAVE_DOT options are set to YES then
 # doxygen will generate a call dependency graph for every global function
 # or class method. Note that enabling this option will significantly increase
 # the time of a run. So in most cases it will be better to enable call graphs
 # for selected functions only using the \callgraph command.
 
 CALL_GRAPH             = NO
 
 # If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
 # doxygen will generate a caller dependency graph for every global function
 # or class method. Note that enabling this option will significantly increase
 # the time of a run. So in most cases it will be better to enable caller
 # graphs for selected functions only using the \callergraph command.
 
 CALLER_GRAPH           = NO
 
 # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
 # will generate a graphical hierarchy of all classes instead of a textual one.
 
 GRAPHICAL_HIERARCHY    = NO
 
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
 # then doxygen will show the dependencies a directory has on other directories
 # in a graphical way. The dependency relations are determined by the #include
 # relations between the files in the directories.
 
-DIRECTORY_GRAPH        = YES
+DIRECTORY_GRAPH        = NO
 
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
 # generated by dot. Possible values are svg, png, jpg, or gif.
 # If left blank png will be used. If you choose svg you need to set
 # HTML_FILE_EXTENSION to xhtml in order to make the SVG files
 # visible in IE 9+ (other browsers do not have this requirement).
 
 DOT_IMAGE_FORMAT       = png
 
 # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
 # enable generation of interactive SVG images that allow zooming and panning.
 # Note that this requires a modern browser other than Internet Explorer.
 # Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
 # need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
 # visible. Older versions of IE do not have SVG support.
 
 INTERACTIVE_SVG        = NO
 
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found in the path.
 
 DOT_PATH               = @US_DOXYGEN_DOT_PATH@
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that
 # contain dot files that are included in the documentation (see the
 # \dotfile command).
 
 DOTFILE_DIRS           =
 
 # The MSCFILE_DIRS tag can be used to specify one or more directories that
 # contain msc files that are included in the documentation (see the
 # \mscfile command).
 
 MSCFILE_DIRS           =
 
 # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
 # nodes that will be shown in the graph. If the number of nodes in a graph
 # becomes larger than this value, doxygen will truncate the graph, which is
 # visualized by representing a node as a red box. Note that doxygen if the
 # number of direct children of the root node in a graph is already larger than
 # DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
 # that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
 
 DOT_GRAPH_MAX_NODES    = 50
 
 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
 # graphs generated by dot. A depth value of 3 means that only nodes reachable
 # from the root by following a path via at most 3 edges will be shown. Nodes
 # that lay further from the root node will be omitted. Note that setting this
 # option to 1 or 2 may greatly reduce the computation time needed for large
 # code bases. Also note that the size of a graph can be further restricted by
 # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
 # background. This is disabled by default, because dot on Windows does not
 # seem to support this out of the box. Warning: Depending on the platform used,
 # enabling this option may lead to badly anti-aliased labels on the edges of
 # a graph (i.e. they become hard to read).
 
 DOT_TRANSPARENT        = NO
 
 # Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This
 # makes dot run faster, but since only newer versions of dot (>1.8.10)
 # support this, this feature is disabled by default.
 
 DOT_MULTI_TARGETS      = NO
 
 # If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
 # generate a legend page explaining the meaning of the various boxes and
 # arrows in the dot generated graphs.
 
 GENERATE_LEGEND        = YES
 
 # If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
 # remove the intermediate dot files that are used to generate
 # the various graphs.
 
 DOT_CLEANUP            = YES
diff --git a/Core/Code/CppMicroServices/documentation/doxygen/MicroServices.dox b/Core/Code/CppMicroServices/documentation/doxygen/MicroServices.dox
index 888beb624a..5d2fdb9cdd 100644
--- a/Core/Code/CppMicroServices/documentation/doxygen/MicroServices.dox
+++ b/Core/Code/CppMicroServices/documentation/doxygen/MicroServices.dox
@@ -1,27 +1,80 @@
 
 /**
 
 \defgroup MicroServices Micro Services Classes
 
 \brief This category includes classes related to the C++ Micro Services component.
 
 The C++ Micro Services component provides a dynamic service registry based on the service layer
 as specified in the OSGi R4.2 specifications.
 
 */
 
 /**
 
+\defgroup MicroServicesUtils Utility Classes
+
+\brief This category includes utility classes which can be used by others.
+
+*/
+
+/**
+
+\page MicroServices_Examples Examples
+
+This is a list of available examples:
+
+- \subpage MicroServices_DictionaryService
+
+*/
+
+/**
+
+\page MicroServices_Tutorials Tutorials
+
+This is a list of available tutorials:
+
+- \subpage MicroServices_TheModuleContext
+- \subpage MicroServices_EmulateSingleton
+
+*/
+
+/**
+
 \embmainpage{MicroServices_Overview} The C++ Micro Services
 
 The C++ Micro Services component provides a dynamic service registry based on the service layer
 as specified in the OSGi R4.2 specifications. It enables users to realize a service oriented
 approach within their software stack. The advantages include higher reuse of components, looser
 coupling, better organization of responsibilities, cleaner API contracts, etc.
 
-Following is a list of use cases and common patterns
+\if us_standalone
+\section MicroServices_Overview_BI Build Instructions
 
-- \subpage MicroServices_EmulateSingleton
+How to build the C++ Micro Services library is explained in detail on the \ref BuildInstructions page.
+\endif
+
+<h1>Examples</h1>
+
+\if us_standalone
+Here is a list of \ref MicroServices_Examples "examples":
+\else
+Here is a list of \subpage MicroServices_Examples "examples":
+\endif
+
+- \ref MicroServices_DictionaryService
+
+<h1>Tutorials</h1>
+
+The following list contains use cases and common patterns in the form of
+\if us_standalone
+\ref MicroServices_Tutorials "tutorials":
+\else
+\subpage MicroServices_Tutorials "tutorials":
+\endif
+
+- \ref MicroServices_TheModuleContext
+- \ref MicroServices_EmulateSingleton
 
 
 */
diff --git a/Core/Code/CppMicroServices/documentation/doxygen/MicroServices_Debugging.dox b/Core/Code/CppMicroServices/documentation/doxygen/MicroServices_Debugging.dox
new file mode 100644
index 0000000000..9e3c9ed92e
--- /dev/null
+++ b/Core/Code/CppMicroServices/documentation/doxygen/MicroServices_Debugging.dox
@@ -0,0 +1,69 @@
+
+/**
+ * \ingroup MicroServicesUtils
+ *
+ * \enum MsgType
+ * This enum describes the messages that can be sent to a message handler (MsgHandler).
+ * You can use the enum to identify and associate the various message types with the
+ * appropriate actions.
+ */
+ 
+/**
+ * \ingroup MicroServicesUtils
+ *
+ * \var MsgType DebugMsg
+ * A debug message.
+ */
+ 
+/**
+ * \ingroup MicroServicesUtils
+ *
+ * \var MsgType InfoMsg
+ * An informational message.
+ */
+ 
+/**
+ * \ingroup MicroServicesUtils
+ *
+ * \var MsgType WarningMsg
+ * A warning message.
+ */
+ 
+/**
+ * \ingroup MicroServicesUtils
+ *
+ * \var MsgType ErrorMsg
+ * An error message.
+ */
+ 
+/**
+ * \ingroup MicroServicesUtils
+ *
+ * \typedef MsgHandler
+ * A message handler callback function.
+ */
+ 
+/**
+ * \ingroup MicroServicesUtils
+ *
+ * \fn MsgHandler installMsgHandler(MsgHandler)
+ * \brief Installs a message handler which has been defined previously.
+ *
+ * Returns a pointer to the previous message handler (which may be 0).
+ *
+ * The message handler is a function that prints out debug messages, warnings,
+ * and fatal error messages. The C++ Micro Services library (debug mode) contains
+ * warning messages that are printed when internal errors (usually invalid function
+ * arguments) occur. The library built in release mode also contains such warnings
+ * unless US_NO_WARNING_OUTPUT and/or US_NO_DEBUG_OUTPUT have been set during
+ * compilation. If you implement your own message handler, you get total control of
+ * these messages.
+ *
+ * The default message handler prints the message to the standard output. If it is
+ * an error message, the application aborts immediately.
+ *
+ * Only one message handler can be defined, since this is usually done on an
+ * application-wide basis to control debug output.
+ *
+ * To restore the message handler, call installMsgHandler(0).
+ */
diff --git a/Core/Code/CppMicroServices/documentation/doxygen/MicroServices_EmulateSingleton.dox b/Core/Code/CppMicroServices/documentation/doxygen/MicroServices_EmulateSingleton.dox
index f5c89649c7..0b3094f105 100644
--- a/Core/Code/CppMicroServices/documentation/doxygen/MicroServices_EmulateSingleton.dox
+++ b/Core/Code/CppMicroServices/documentation/doxygen/MicroServices_EmulateSingleton.dox
@@ -1,90 +1,91 @@
 /**
 
 \page MicroServices_EmulateSingleton Emulating singletons with micro services
 
 \section MicroServices_EmulateSingleton_1 Meyers Singleton
 
 Singletons are a well known pattern to ensure that only one instance of a class exists
 during the whole life-time of the application. A self-deleting variant is the "Meyers Singleton":
 
 \snippet uServices-singleton/SingletonOne.h s1
 
 where the GetInstance() method is implemented as
 
 \snippet uServices-singleton/SingletonOne.cpp s1
 
 If such a singleton is accessed during static deinitialization (which happens during unloading
 of shared libraries or application termination), your program might crash or even worse, exhibit undefined
 behavior, depending on your compiler and/or weekday. Such an access might happen in destructors of
 other objects with static life-time.
 
 For example, suppose that SingletonOne needs to call a second Meyers singleton during destruction:
 
 \snippet uServices-singleton/SingletonOne.cpp s1d
 
 If SingletonTwo was destroyed before SingletonOne, this leads to the mentioned problems. Note that
 this problem only occurs for static objects defined in the same shared library.
 
 Since you cannot reliably control the destruction order of global static objects, you must not
 introduce dependencies between them during static deinitialization. This is one reason why one
 should consider an alternative approach to singletons (unless you can absolutely make sure that nothing in
 your shared library will introduce such dependencies. Never.)
 
 Of course you could use something like a "Phoenix singleton" but that will have other drawbacks in certain
 scenarios. Returning pointers instead of references in GetInstance() would open up the possibility to
 return NULL, but than again this would not help if you require a non-NULL instance in your destructor.
 
 Another reason for an alternative approach is that singletons are usually not meant to be singletons for eternity.
 If your design evolves, you might hit a point where you suddenly need multiple instances of your singleton.
 
 \section MicroServices_EmulateSingleton_2 Singletons as a service
 
-The MITK Micro Services can be used to emulate the singleton pattern using a non-singleton class. This
+The C++ Micro Services can be used to emulate the singleton pattern using a non-singleton class. This
 leaves room for future extensions without the need for heavy refactoring. Additionally, it gives you
 full control about the construction and destruction order of your "singletons" inside your shared library
 or executable, making it possible to have dependencies between them during destruction.
 
 \subsection MicroServices_EmulateSingleton_2_1 Converting a classic singleton
 
-We modify the previous SingletonOne class such that it internally uses the MITK micro services API. The changes
+We modify the previous SingletonOne class such that it internally uses the micro services API. The changes
 are discussed in detail below.
 
 \snippet uServices-singleton/SingletonOne.h ss1
 
- - Inherit itk::LightObject: All service implementations (not their interfaces) must inherit from itk::LightObject.
+ - Inherit us::Base: All service implementations (not their interfaces) must inherit from us::Base or from the base
+   class as specified in the CMake configuration.
    In the implementation above, the class SingletonOneService provides the implementation as well as the interface.
  - Friend activator: We move the responsibility of constructing instances of SingletonOneService from the GetInstance()
    method to the module activator.
  - Service interface declaration: Because the SingletonOneService class introduces a new service interface, it must
-   be registered under a unique name using the helper macro MITK_DECLARE_SERVICE_INTERFACE.
+   be registered under a unique name using the helper macro US_DECLARE_SERVICE_INTERFACE.
    
 Let's have a look at the modified GetInstance() and ~SingletonOneService() methods.
 
 \snippet uServices-singleton/SingletonOne.cpp ss1gi
 
 The inline comments should explain the details. Note that we now had to change the return type to a pointer, instead
 of a reference as in the classic singleton. This is necessary since we can no longer guarantee that an instance
 always exists. Clients of the GetInstance() method must check for null pointers and react appropriately.
 
 \warning Newly created "singletons" should not expose a GetInstance() method. They should be handled as proper
-services and hence should be retrieved by clients using the mitk::ModuleContext or mitk::ServiceTracker API. The
+services and hence should be retrieved by clients using the ModuleContext or ServiceTracker API. The
 GetInstance() method is for migration purposes only.
 
 \snippet uServices-singleton/SingletonOne.cpp ss1d
 
 The SingletonTwoService::GetInstance() method is implemented exactly as in SingletonOneService. Because we know
 that the module activator guarantees that a SingletonTwoService instance will always be available during the
 life-time of a SingletonOneService instance (see below), we can assert a non-null pointer. Otherwise, we would
 have to handle the null-pointer case.
 
 The order of construction/registration and destruction/unregistration of our singletons (or any other services) is
 defined in the Load() and Unload() methods of the module activator.
 
 \snippet uServices-singleton/main.cpp 0
 
 The Unload() method is defined as:
 
 \snippet uServices-singleton/main.cpp 1
 
 
 */
diff --git a/Core/Code/CppMicroServices/documentation/doxygen/MicroServices_TheModuleContext.md b/Core/Code/CppMicroServices/documentation/doxygen/MicroServices_TheModuleContext.md
new file mode 100644
index 0000000000..9f45bdabf9
--- /dev/null
+++ b/Core/Code/CppMicroServices/documentation/doxygen/MicroServices_TheModuleContext.md
@@ -0,0 +1,36 @@
+The %Module Context    {#MicroServices_TheModuleContext}
+===================
+
+In the context of the C++ Micro Services library, we will call all supported "shared library" types
+(DLL, DSO, DyLib, etc.) uniformly a *module*. A module accesses the C++ Micro Services API via a
+ModuleContext object. While multiple modules could use the same ModuleContext, it is highly recommended
+that each module gets its own (this will enable module specific service usage tracking and also allows
+the C++ Micro Services framework to properly cleanup resources after a module has been unloaded).
+
+### Creating a %ModuleContext
+
+To create a ModuleContext object for a specific library, you have two options. If your project uses
+CMake as the build system, use the supplied `usFunctionGenerateModuleInit` CMake function to automatically
+create a source file and add it to your module's sources:
+
+    set(module_srcs )
+    usFunctionGenerateModuleInit(module_srcs
+                                 NAME "My Module"
+                                 LIBRARY_NAME "mylibname"
+                                 VERSION "1.0.0"
+                                )
+    add_library(mylib ${module_srcs})
+    
+If you do not use CMake, you have to add a call to the macro `US_INITIALIZE_MODULE` in one of the source
+files of your module:
+
+\snippet uServices-modulecontext/main.cpp InitializeModule
+
+### Getting a %ModuleContext
+
+To retrieve the module specific ModuleContext object from anywhere in your module, use the
+`GetModuleContext` function:
+
+\snippet uServices-modulecontext/main.cpp GetModuleContext
+
+Please note that the call to `GetModuleContext` will fail if you did not create a module specific context.
diff --git a/Core/Code/CppMicroServices/documentation/doxygen/doxygen.css b/Core/Code/CppMicroServices/documentation/doxygen/doxygen.css
new file mode 100644
index 0000000000..6d43eb7a9a
--- /dev/null
+++ b/Core/Code/CppMicroServices/documentation/doxygen/doxygen.css
@@ -0,0 +1,1103 @@
+/* The standard CSS for doxygen */
+
+/*
+body, table, div, p, dl {
+  font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif;
+  font-size: 13px;
+  line-height: 1.3;
+}
+*/
+
+/* @group Heading Levels */
+
+h1 {
+  font-size: 150%;
+}
+
+.title {
+  font-size: 150%;
+  font-weight: bold;
+  margin: 10px 2px;
+}
+
+h2 {
+  font-size: 120%;
+}
+
+h3 {
+  font-size: 100%;
+}
+
+dt {
+  font-weight: bold;
+}
+
+div.multicol {
+  -moz-column-gap: 1em;
+  -webkit-column-gap: 1em;
+  -moz-column-count: 3;
+  -webkit-column-count: 3;
+}
+
+p.startli, p.startdd, p.starttd {
+  margin-top: 2px;
+}
+
+p.endli {
+  margin-bottom: 0px;
+}
+
+p.enddd {
+  margin-bottom: 4px;
+}
+
+p.endtd {
+  margin-bottom: 2px;
+}
+
+/* @end */
+
+caption {
+  font-weight: bold;
+}
+
+span.legend {
+        font-size: 70%;
+        text-align: center;
+}
+
+h3.version {
+        font-size: 90%;
+        text-align: center;
+}
+
+div.qindex, div.navtab{
+  border: 1px solid #e6e6e6;
+  text-align: center;
+}
+
+div.qindex, div.navpath {
+  width: 100%;
+  padding: 0 10px;
+}
+
+div.navtab {
+  margin-right: 15px;
+}
+
+/* @group Link Styling */
+
+a {
+  font-weight: normal;
+  text-decoration: none;
+}
+
+.contents a:visited {
+  color: #4665A2;
+}
+
+a.qindex {
+  font-weight: bold;
+}
+
+a.qindexHL {
+  font-weight: bold;
+  background-color: #9CAFD4;
+  color: #ffffff;
+  border: 1px double #869DCA;
+}
+
+.contents a.qindexHL:visited {
+        color: #ffffff;
+}
+
+a.el {
+  font-weight: bold;
+}
+
+a.elRef {
+}
+
+a.code, a.code:visited {
+  color: #4665A2; 
+}
+
+a.codeRef, a.codeRef:visited {
+  color: #4665A2; 
+}
+
+/* @end */
+
+dl.el {
+  margin-left: -1cm;
+}
+
+.fragment {
+  font-family: monospace, fixed;
+  font-size: 105%;
+}
+
+pre.fragment {
+  border-top-style: solid;
+  border-bottom-style: solid;
+  border-width: 1px 0 1px 0;
+  border-color: #e6e6e6;
+  border-radius: 0;
+  padding: 4px 6px;
+  margin: 4px 8px 4px 2px;
+  overflow: auto;
+  word-wrap: break-word;
+  font-size:  9pt;
+  line-height: 125%;
+}
+
+div.ah {
+  background-color: #f6f6f6;
+  font-weight: bold;
+  margin-bottom: 3px;
+  margin-top: 3px;
+  padding: 0.2em;
+  border: solid thin #e6e6e6;
+  border-radius: 0.5em;
+  -webkit-border-radius: .5em;
+  -moz-border-radius: .5em;
+}
+
+div.groupHeader {
+  margin-left: 16px;
+  margin-top: 12px;
+  font-weight: bold;
+}
+
+div.groupText {
+  margin-left: 16px;
+  font-style: italic;
+}
+
+div.contents {
+  margin-top: 10px;
+  margin-left: 8px;
+  margin-right: 8px;
+}
+
+td.indexkey {
+  font-weight: bold;
+  margin: 2px 0px 2px 0;
+  padding: 2px 10px;
+        white-space: nowrap;
+        vertical-align: top;
+}
+
+td.indexvalue {
+  padding: 2px 10px;
+  margin: 2px 0px;
+}
+
+tr.memlist {
+  background-color: #EEF1F7;
+}
+
+p.formulaDsp {
+  text-align: center;
+}
+
+img.formulaDsp {
+  
+}
+
+img.formulaInl {
+  vertical-align: middle;
+}
+
+div.center {
+  text-align: center;
+        margin-top: 0px;
+        margin-bottom: 0px;
+        padding: 0px;
+}
+
+div.center img {
+  border: 0px;
+}
+
+address.footer {
+  text-align: right;
+  padding-right: 12px;
+}
+
+img.footer {
+  border: 0px;
+  vertical-align: middle;
+}
+
+/* @group Code Colorization */
+
+span.keyword {
+  color: #008000
+}
+
+span.keywordtype {
+  color: #604020
+}
+
+span.keywordflow {
+  color: #e08000
+}
+
+span.comment {
+  color: #800000
+}
+
+span.preprocessor {
+  color: #806020
+}
+
+span.stringliteral {
+  color: #002080
+}
+
+span.charliteral {
+  color: #008080
+}
+
+span.vhdldigit { 
+  color: #ff00ff 
+}
+
+span.vhdlchar { 
+  color: #000000 
+}
+
+span.vhdlkeyword { 
+  color: #700070 
+}
+
+span.vhdllogic { 
+  color: #ff0000 
+}
+
+blockquote {
+        background-color: #F7F8FB;
+        border-left: 2px solid #9CAFD4;
+        margin: 0 24px 0 4px;
+        padding: 0 12px 0 16px;
+}
+
+/* @end */
+
+/*
+.search {
+  color: #003399;
+  font-weight: bold;
+}
+
+form.search {
+  margin-bottom: 0px;
+  margin-top: 0px;
+}
+
+input.search {
+  font-size: 75%;
+  color: #000080;
+  font-weight: normal;
+  background-color: #e8eef2;
+}
+*/
+
+td.tiny {
+  font-size: 75%;
+}
+
+.dirtab {
+  padding: 4px;
+  border-collapse: collapse;
+  border: 1px solid #A3B4D7;
+}
+
+th.dirtab {
+  background: #EBEFF6;
+  font-weight: bold;
+}
+
+hr {
+  height: 0px;
+  border: none;
+  border-top: 1px solid #e6e6e6;
+}
+
+hr.footer {
+  height: 1px;
+}
+
+/* @group Member Descriptions */
+
+table.memberdecls {
+  border-spacing: 0px;
+  padding: 0px;
+}
+
+.memberdecls td {
+  -webkit-transition-property: background-color, box-shadow;
+  -webkit-transition-duration: 0.5s;
+  -moz-transition-property: background-color, box-shadow;
+  -moz-transition-duration: 0.5s;
+  -ms-transition-property: background-color, box-shadow;
+  -ms-transition-duration: 0.5s;
+  -o-transition-property: background-color, box-shadow;
+  -o-transition-duration: 0.5s;
+  transition-property: background-color, box-shadow;
+  transition-duration: 0.5s;
+}
+
+.memberdecls td.glow {
+  background-color: cyan;
+  box-shadow: 0 0 15px cyan;
+}
+
+.mdescLeft, .mdescRight,
+.memItemLeft, .memItemRight,
+.memTemplItemLeft, .memTemplItemRight, .memTemplParams {
+  /*background-color: #F9FAFC;*/
+  border: none;
+  margin: 4px;
+  padding: 1px 0 0 8px;
+}
+
+.mdescLeft, .mdescRight {
+  padding: 0px 8px 4px 8px;
+  color: #555;
+}
+
+/*
+.memItemLeft, .memItemRight, .memTemplParams {
+  border-top: 1px solid #C4CFE5;
+}
+*/
+
+.memItemLeft, .memTemplItemLeft {
+        white-space: nowrap;
+}
+
+.memItemRight {
+  width: 100%;
+}
+
+.memTemplParams {
+  color: #4665A2;
+        white-space: nowrap;
+}
+
+/* @end */
+
+/* @group Member Details */
+
+/* Styles for detailed member documentation */
+
+.memtemplate {
+  font-size: 80%;
+  color: #4665A2;
+  font-weight: normal;
+  margin-left: 9px;
+}
+
+.memnav {
+  background-color: #EBEFF6;
+  border: 1px solid #A3B4D7;
+  text-align: center;
+  margin: 2px;
+  margin-right: 15px;
+  padding: 2px;
+}
+
+.mempage {
+  width: 100%;
+}
+
+.memitem {
+  padding: 0;
+  margin-bottom: 10px;
+  margin-right: 5px;
+        -webkit-transition: box-shadow 0.5s linear;
+        -moz-transition: box-shadow 0.5s linear;
+        -ms-transition: box-shadow 0.5s linear;
+        -o-transition: box-shadow 0.5s linear;
+        transition: box-shadow 0.5s linear;
+}
+
+.memitem.glow {
+         box-shadow: 0 0 15px cyan;
+}
+
+.memname {
+        font-weight: bold;
+        margin-left: 6px;
+}
+
+.memname td {
+  vertical-align: bottom;
+}
+
+.memproto, dl.reflist dt {
+        border-top: 1px solid #e6e6e6;
+        border-left: 1px solid #e6e6e6;
+        border-right: 1px solid #e6e6e6;
+        padding: 6px 0px 6px 0px;
+        color: #253555;
+        font-weight: bold;
+        /* opera specific markup */
+        border-top-right-radius: 8px;
+        border-top-left-radius: 8px;
+        /* firefox specific markup */
+        -moz-border-radius-topright: 8px;
+        -moz-border-radius-topleft: 8px;
+        /* webkit specific markup */
+        -webkit-border-top-right-radius: 8px;
+        -webkit-border-top-left-radius: 8px;
+        background-color: #f6f6f6;
+
+}
+
+.memdoc, dl.reflist dd {
+        border-bottom: 1px solid #e6e6e6;
+        border-left: 1px solid #e6e6e6;
+        border-right: 1px solid #e6e6e6;
+        padding: 2px 5px;
+        border-top-width: 0;
+        /* opera specific markup */
+        border-bottom-left-radius: 8px;
+        border-bottom-right-radius: 8px;
+        /* firefox specific markup */
+        -moz-border-radius-bottomleft: 8px;
+        -moz-border-radius-bottomright: 8px;
+        /* webkit specific markup */
+        -webkit-border-bottom-left-radius: 8px;
+        -webkit-border-bottom-right-radius: 8px;
+}
+
+dl.reflist dt {
+        padding: 5px;
+}
+
+dl.reflist dd {
+        margin: 0px 0px 10px 0px;
+        padding: 5px;
+}
+
+.paramkey {
+  text-align: right;
+}
+
+.paramtype {
+  white-space: nowrap;
+}
+
+.paramname {
+  color: #602020;
+  white-space: nowrap;
+}
+.paramname em {
+  font-style: normal;
+}
+
+.params, .retval, .exception, .tparams {
+        margin-left: 0px;
+        padding-left: 0px;
+}       
+
+.params .paramname, .retval .paramname {
+        font-weight: bold;
+        vertical-align: top;
+}
+        
+.params .paramtype {
+        font-style: italic;
+        vertical-align: top;
+}       
+        
+.params .paramdir {
+        font-family: "courier new",courier,monospace;
+        vertical-align: top;
+}
+
+table.mlabels {
+  border-spacing: 0px;
+}
+
+td.mlabels-left {
+  width: 100%;
+  padding: 0px;
+}
+
+td.mlabels-right {
+  vertical-align: bottom;
+  padding: 0px;
+  white-space: nowrap;
+}
+
+span.mlabels {
+        margin-left: 8px;
+}
+
+span.mlabel {
+        background-color: #728DC1;
+        border-top:1px solid #405C93;
+        border-left:1px solid #405C93;
+        border-right:1px solid #C4CFE5;
+        border-bottom:1px solid #C4CFE5;
+  text-shadow: none;
+        color: white;
+        margin-right: 4px;
+        padding: 2px 3px;
+        border-radius: 3px;
+        font-size: 7pt;
+  white-space: nowrap;
+}
+
+
+
+/* @end */
+
+/* these are for tree view when not used as main index */
+
+div.directory {
+        margin: 10px 0px;
+      /*border-top: 1px solid #A8B8D9;
+        border-bottom: 1px solid #A8B8D9;*/
+        width: 100%;
+}
+
+.directory table {
+        border-collapse:collapse;
+}
+
+.directory td {
+        margin: 0px;
+        padding: 0px;
+  vertical-align: baseline;
+}
+
+.directory td.entry {
+        white-space: nowrap;
+        padding-right: 6px;
+}
+
+.directory td.desc {
+        width: 100%;
+        padding-left: 6px;
+  padding-right: 6px;
+  border-left: 1px solid rgba(0,0,0,0.05);
+}
+
+.directory tr.even {
+  padding-left: 6px;
+  /*background-color: #F7F8FB;*/
+}
+
+.directory img {
+  vertical-align: -30%;
+}
+
+.directory .levels {
+        white-space: nowrap;
+        width: 100%;
+        text-align: right;
+        font-size: 9pt;
+}
+
+.directory .levels span {
+        cursor: pointer;
+        padding-left: 2px;
+        padding-right: 2px;
+  color: #3D578C;
+}
+
+div.dynheader {
+  margin-top: 8px;
+}
+
+address {
+  font-style: normal;
+  margin: 0;
+}
+
+table.doxtable {
+  border-collapse:collapse;
+        margin-top: 4px;
+        margin-bottom: 4px;
+}
+
+table.doxtable td, table.doxtable th {
+  border: 1px solid #2D4068;
+  padding: 3px 7px 2px;
+}
+
+table.doxtable th {
+  background-color: #374F7F;
+  color: #FFFFFF;
+  font-size: 110%;
+  padding-bottom: 4px;
+  padding-top: 5px;
+}
+
+table.fieldtable {
+        width: 100%;
+        margin-bottom: 10px;
+        border: 1px solid #A8B8D9;
+        border-spacing: 0px;
+        -moz-border-radius: 4px;
+        -webkit-border-radius: 4px;
+        border-radius: 4px;
+        -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
+        -webkit-box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
+        box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
+}
+
+.fieldtable td, .fieldtable th {
+        padding: 3px 7px 2px;
+}
+
+.fieldtable td.fieldtype, .fieldtable td.fieldname {
+        white-space: nowrap;
+        border-right: 1px solid #A8B8D9;
+        border-bottom: 1px solid #A8B8D9;
+        vertical-align: top;
+}
+
+.fieldtable td.fielddoc {
+        border-bottom: 1px solid #A8B8D9;
+        width: 100%;
+}
+
+.fieldtable tr:last-child td {
+        border-bottom: none;
+}
+
+.fieldtable th {
+        background-image:url('nav_f.png');
+        background-repeat:repeat-x;
+        background-color: #E2E8F2;
+        font-size: 90%;
+        color: #253555;
+        padding-bottom: 4px;
+        padding-top: 5px;
+        text-align:left;
+        -moz-border-radius-topleft: 4px;
+        -moz-border-radius-topright: 4px;
+        -webkit-border-top-left-radius: 4px;
+        -webkit-border-top-right-radius: 4px;
+        border-top-left-radius: 4px;
+        border-top-right-radius: 4px;
+        border-bottom: 1px solid #A8B8D9;
+}
+
+
+.tabsearch {
+  top: 0px;
+  left: 10px;
+  height: 36px;
+  background-image: url('tab_b.png');
+  z-index: 101;
+  overflow: hidden;
+  font-size: 13px;
+}
+
+.navpath ul
+{
+  font-size: 11px;
+  overflow:hidden;
+  margin:0px;
+  padding:0px;
+}
+
+.navpath li
+{
+  list-style-type:none;
+  float:left;
+  padding-left:10px;
+  padding-right:15px;
+}
+
+.navpath li.navelem a
+{
+  height:22px;
+  display:block;
+  text-decoration: none;
+  outline: none;
+  color: #999;
+}
+
+.navpath li.navelem a:hover
+{
+  text-decoration: underline;
+}
+
+.navpath li.footer
+{
+        list-style-type:none;
+        float:right;
+        padding-left:10px;
+        padding-right:15px;
+        background-image:none;
+        background-repeat:no-repeat;
+        background-position:right;
+        color:#364D7C;
+        font-size: 8pt;
+}
+
+
+div.summary
+{
+  float: right;
+  font-size: 8pt;
+  padding-right: 5px;
+  width: 50%;
+  text-align: right;
+}       
+
+div.summary a
+{
+  white-space: nowrap;
+}
+
+div.ingroups
+{
+  margin-left: 5px;
+  font-size: 8pt;
+  padding-left: 5px;
+  width: 50%;
+  text-align: left;
+}
+
+div.ingroups a
+{
+  white-space: nowrap;
+}
+
+div.header
+{
+  margin:  0px;
+  border-bottom: 1px solid #333333;
+}
+
+div.headertitle
+{
+  padding: 0px 5px 0px 7px;
+}
+
+dl
+{
+        padding: 0 0 0 10px;
+}
+
+/* dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug */
+dl.section
+{
+  margin-left: 0px;
+  padding-left: 0px;
+}
+
+dl.note
+{
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
+        border-color: #D0C000;
+}
+
+dl.warning, dl.attention
+{
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
+        border-color: #FF0000;
+}
+
+dl.pre, dl.post, dl.invariant
+{
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
+        border-color: #00D000;
+}
+
+dl.deprecated
+{
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
+        border-color: #505050;
+}
+
+dl.todo
+{
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
+        border-color: #00C0E0;
+}
+
+dl.test
+{
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
+        border-color: #3030E0;
+}
+
+dl.bug
+{
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
+        border-color: #C08050;
+}
+
+dl.section dd {
+  margin-bottom: 6px;
+}
+
+
+#projectlogo
+{
+  text-align: center;
+  vertical-align: bottom;
+  border-collapse: separate;
+}
+ 
+#projectlogo img
+{ 
+  border: 0px none;
+}
+ 
+#projectname
+{
+  font: 300% Tahoma, Arial,sans-serif;
+  margin: 0px;
+  padding: 2px 0px;
+}
+    
+#projectbrief
+{
+  font: 120% Tahoma, Arial,sans-serif;
+  margin: 0px;
+  padding: 0px;
+}
+
+#projectnumber
+{
+  font: 50% Tahoma, Arial,sans-serif;
+  margin: 0px;
+  padding: 0px;
+}
+
+#titlearea
+{
+  padding: 0px;
+  margin: 0px;
+  width: 100%;
+  border-bottom: 1px solid #5373B4;
+}
+
+.image
+{
+        text-align: center;
+}
+
+.dotgraph
+{
+        text-align: center;
+}
+
+.mscgraph
+{
+        text-align: center;
+}
+
+.caption
+{
+  font-weight: bold;
+}
+
+div.zoom
+{
+  border: 1px solid #90A5CE;
+}
+
+dl.citelist {
+        margin-bottom:50px;
+}
+
+dl.citelist dt {
+        color:#334975;
+        float:left;
+        font-weight:bold;
+        margin-right:10px;
+        padding:5px;
+}
+
+dl.citelist dd {
+        margin:2px 0;
+        padding:5px 0;
+}
+
+div.toc {
+        padding: 14px 25px;
+        background-color: #F4F6FA;
+        border: 1px solid #D8DFEE;
+        border-radius: 7px 7px 7px 7px;
+        float: right;
+        height: auto;
+        margin: 0 20px 10px 10px;
+        width: 200px;
+}
+
+div.toc li {
+        background: url("bdwn.png") no-repeat scroll 0 5px transparent;
+        font: 10px/1.2 Verdana,DejaVu Sans,Geneva,sans-serif;
+        margin-top: 5px;
+        padding-left: 10px;
+        padding-top: 2px;
+}
+
+div.toc h3 {
+        font: bold 12px/1.2 Arial,FreeSans,sans-serif;
+  color: #4665A2;
+        border-bottom: 0 none;
+        margin: 0;
+}
+
+div.toc ul {
+        list-style: none outside none;
+        border: medium none;
+        padding: 0px;
+}       
+
+div.toc li.level1 {
+        margin-left: 0px;
+}
+
+div.toc li.level2 {
+        margin-left: 15px;
+}
+
+div.toc li.level3 {
+        margin-left: 30px;
+}
+
+div.toc li.level4 {
+        margin-left: 45px;
+}
+
+.inherit_header {
+        font-weight: bold;
+        color: gray;
+        cursor: pointer;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+.inherit_header td {
+        padding: 6px 0px 2px 5px;
+}
+
+.inherit {
+        display: none;
+}
+
+tr.heading h2 {
+        margin-top: 12px;
+        margin-bottom: 4px;
+}
+
+@media print
+{
+  #top { display: none; }
+  #side-nav { display: none; }
+  #nav-path { display: none; }
+  body { overflow:visible; }
+  h1, h2, h3, h4, h5, h6 { page-break-after: avoid; }
+  .summary { display: none; }
+  .memitem { page-break-inside: avoid; }
+  #doc-content
+  {
+    margin-left:0 !important;
+    height:auto !important;
+    width:auto !important;
+    overflow:inherit;
+    display:inline;
+  }
+  pre.fragment
+  {
+    overflow: visible;
+    text-wrap: unrestricted;
+    white-space: -moz-pre-wrap; /* Moz */
+    white-space: -pre-wrap; /* Opera 4-6 */
+    white-space: -o-pre-wrap; /* Opera 7 */
+    white-space: pre-wrap; /* CSS3  */
+    word-wrap: break-word; /* IE 5.5+ */
+  }
+}
+
+code {
+  background-color: none;
+  border: none;
+  color: #333333;
+  padding: 1;
+}
+
+.doxygen-header {
+  background-color: #F5F5F5;
+  margin: -20px -20px 20px;
+}
+
+.tabs, .tabs2, .tabs3 {
+    width: 100%;
+    font-size: 16px;
+    position: relative;
+}
+
+.tabs2 {
+    font-size: 14px;
+}
+.tabs3 {
+    font-size: 12px;
+}
+
+.tablist {
+    margin: 0;
+    padding: 0;
+    display: table;
+}
+
+.tablist li {
+    float: left;
+    display: table-cell;
+    list-style: none;
+}
+
+.tablist a {
+    display: block;
+    padding: 10px 20px;
+    font-weight: bold;
+    color: #999999;
+    text-decoration: none;
+    outline: none;
+}
+
+.tabs3 .tablist a {
+    padding: 0 10px;
+}
+
+.tablist a:hover {
+    text-decoration: underline;
+}
+
+.tablist li.current a {
+    color: #fff;
+    background-color: #bbb;
+}
+
diff --git a/Core/Code/CppMicroServices/documentation/doxygen/examples/MicroServices_DictionaryService.md b/Core/Code/CppMicroServices/documentation/doxygen/examples/MicroServices_DictionaryService.md
new file mode 100644
index 0000000000..827280b91e
--- /dev/null
+++ b/Core/Code/CppMicroServices/documentation/doxygen/examples/MicroServices_DictionaryService.md
@@ -0,0 +1,29 @@
+Implementing A Dictionary Service    {#MicroServices_DictionaryService}
+=================================
+
+This example demonstrates how to implement a service object. First, we must define the service interface
+and then we define an implementation of that interface. In this particular example, we will create a
+dictionary service that we can use to check if a word exists, which indicates if the word is spelled
+correctly or not.
+
+We start by defining the dictionary interface (for example in a file called DictionaryService.h):
+
+\include uServices-dictionaryservice/DictionaryService.h
+
+The service interface is quite simple, with only one method that needs to be implemented. Notice that the
+file does only contain the interface declaration and no actual code.
+
+In the following source code, the module uses its module context to register the dictionary service.
+We implement the dictionary service as an inner class of the module activator class, but we could have also
+put it in a separate file. Also note that there is no need to explicityl export any symbols from the module.
+
+\snippet uServices-dictionaryservice/main.cpp Activator
+
+Note that we do not need to unregister the service in the `Unload` method, because it will be done automatically
+for us during static de-initialization of the module.
+
+In the last line, we "export" the module activator, assuming that it is contained in a module named
+`DictionaryServiceModule`. We can get the highest ranking service implementation for the DictionaryService interface
+by querying the service registry via the module context:
+
+\snippet uServices-dictionaryservice/main.cpp GetDictionaryService
diff --git a/Core/Code/CppMicroServices/documentation/doxygen/footer.html b/Core/Code/CppMicroServices/documentation/doxygen/footer.html
new file mode 100644
index 0000000000..38c8204a29
--- /dev/null
+++ b/Core/Code/CppMicroServices/documentation/doxygen/footer.html
@@ -0,0 +1,9 @@
+<!--BEGIN GENERATE_TREEVIEW-->
+   </ul>
+ </div>
+<!--END GENERATE_TREEVIEW-->
+
+  <hr class="footer"/>
+  <address class="footer"><small>Generated on $date for $projectname $projectnumber by <a href="http://www.doxygen.org/index.html">Doxygen</a> $doxygenversion
+  </small></address>
+
diff --git a/Core/Code/CppMicroServices/documentation/doxygen/header.html b/Core/Code/CppMicroServices/documentation/doxygen/header.html
new file mode 100644
index 0000000000..847964d749
--- /dev/null
+++ b/Core/Code/CppMicroServices/documentation/doxygen/header.html
@@ -0,0 +1,27 @@
+---
+layout: default
+title: $title
+---
+
+  <head>
+
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    
+    <link href="$relpath$doxygen.css" rel="stylesheet" type="text/css" />
+    
+    $treeview
+    $search
+    $mathjax
+    
+    <style>
+      #MSearchField { height: 14px; }
+      #MSearchClose { top: 1px; }
+    </style>
+
+  </head>
+
+  <div class="doxygen-header" id="top"><!-- do not remove this div! -->
+  
diff --git a/Core/Code/CppMicroServices/documentation/doxygen/standalone/BuildInstructions.md b/Core/Code/CppMicroServices/documentation/doxygen/standalone/BuildInstructions.md
new file mode 100644
index 0000000000..e7f055886a
--- /dev/null
+++ b/Core/Code/CppMicroServices/documentation/doxygen/standalone/BuildInstructions.md
@@ -0,0 +1,77 @@
+Build Instructions    {#BuildInstructions}
+==================
+
+The C++ Micro Services library provides [CMake][cmake] build scripts which allow the generation of
+platform and IDE specific project files.
+
+The library should compile on many different platforms. Below is a list of tested compiler/OS combinations:
+
+  - GCC 4.5 (Ubuntu 11.04 and MacOS X 10.6)
+  - Visual Studio 2008 and 2010
+  - Clang 3.0 (Ubuntu 11.04 and MacOS X 10.6)
+
+
+Prerequisites
+-------------
+
+- [CMake][cmake] 2.8 (Visual Studio 2010 users should use the latest CMake version available)
+
+
+Configuring the Build
+---------------------
+
+When building the C++ Micro Services library, you have a few configuration options at hand.
+
+### General build options
+
+- **US_BUILD_SHARED_LIBS**
+  Specify if the library should be build shared or static. Please note that static mode is experimental
+  and has not received extensive testing yet.
+- **US_BUILD_TESTING**
+  Build unit tests and code snippets.
+- **US_ENABLE_THREADING_SUPPORT**
+  Enable the use of synchronization primitives (atomics and pthread mutexes or Windows primitives) to make
+  the API thread-safe. If you are application is not multi-threaded, turn this option OFF to get maximum
+  performance.
+- **US_USE_C++11 (advanced)**
+  Enable the usage of C++11 constructs
+
+### Customizing naming conventions
+
+- **US_NAMESPACE**
+  The default namespace is `us` but you may override this at will.
+- **US_HEADER_PREFIX**
+  By default, all public headers have a "us" prefix. You may specify an arbitrary prefix to match your
+  naming conventions.
+
+The above options are mainly useful when embedding the C++ Micro Services source code in your own library and
+you want to make it look like native source code.
+
+### Configure the service base class
+
+All service implementations must inherit from the same base class. The C++ Micro Services library provides
+a trivial class called `us::Base` for that purpose. However, most applications already have a special base
+class and you can configure the C++ Micro Services library to use that class.
+
+- **US_BASECLASS_NAME**
+  The fully-qualified name of the base class, e.g. `my::OwnBaseClass`. If you don't need support for service
+  factories (see below) and don't want to enable US_BUILD_TESTING, this is all you need.
+- **US_ENABLE_SERVICE_FACTORY_SUPPORT (advanced)**
+  If you want support for service factories (they allow the customization of service objects for individual
+  modules, see OSGi Service Platform Core Specification Release 4, Version 4.3, Section 5.6), switch this
+  option to ON. If you also provided a custom US_BASECLASS_NAME, you need to set the US_BASECLASS_HEADER variable.
+- **US_BASECLASS_HEADER (advanced)**
+  The name of the header file containing the declaration for the base class specified in US_BASECLASS_NAME, e.g.
+  `myOwnBaseClass.h`. You will also have to set US_BASECLASS_PACKAGE or US_BASECLASS_INCLUDE_DIRS and US_BASECLASS_LIBRARIES.
+- **US_BASECLASS_PACKAGE (advanced)**
+  If your specified a custom base class from a library which can be found via a CMake `find_package` command, enter
+  the package name here. Most of the time, this will correctly set the values for US_BASECLASS_INCLUDE_DIRS,
+  US_BASECLASS_LIBRARIES, and US_BASECLASS_LIBRARY_DIRS.
+- **US_BASECLASS_INCLUDE_DIRS (advanced)**
+  A list of include dirs needed to include the base class header file as specified in US_BASECLASS_HEADER.
+- **US_BASECLASS_LIBRARIES (advanced)**
+  A list of libraries to link the C++ Micro Services library against for resolving symbols needed for a custom base class.
+- **US_BASECLASS_LIBRARY_DIRS (advanced)**
+  A list of directories to look for the libraries specified in US_BASECLASS_LIBRARIES
+
+[cmake]: http://www.cmake.org
diff --git a/Core/Code/CppMicroServices/documentation/snippets/uServices-activator/main.cpp b/Core/Code/CppMicroServices/documentation/snippets/uServices-activator/main.cpp
index b754c987ba..35d4e6aeb9 100644
--- a/Core/Code/CppMicroServices/documentation/snippets/uServices-activator/main.cpp
+++ b/Core/Code/CppMicroServices/documentation/snippets/uServices-activator/main.cpp
@@ -1,28 +1,27 @@
-#include <usExportMacros.h>
 #include <usModuleActivator.h>
 
 US_USE_NAMESPACE
 
 //! [0]
 class MyActivator : public ModuleActivator
 {
 
 public:
 
   void Load(ModuleContext* /*context*/)
   { /* register stuff */ }
   
 
   void Unload(ModuleContext* /*context*/)
   { /* cleanup */ }
 
 };
 
 US_EXPORT_MODULE_ACTIVATOR(mylibname, MyActivator)
 //![0]
 
 int main(int /*argc*/, char* /*argv*/[])
 {
   MyActivator ma;
   return 0;
 }
diff --git a/Core/Code/CppMicroServices/documentation/snippets/uServices-dictionaryservice/DictionaryService.h b/Core/Code/CppMicroServices/documentation/snippets/uServices-dictionaryservice/DictionaryService.h
new file mode 100644
index 0000000000..304d76c6c3
--- /dev/null
+++ b/Core/Code/CppMicroServices/documentation/snippets/uServices-dictionaryservice/DictionaryService.h
@@ -0,0 +1,27 @@
+#ifndef DICTIONARYSERVICE_H
+#define DICTIONARYSERVICE_H
+
+#include <usServiceInterface.h>
+
+#include <string>
+
+/**
+ * A simple service interface that defines a dictionary service.
+ * A dictionary service simply verifies the existence of a word.
+ **/
+struct DictionaryService
+{
+  virtual ~DictionaryService() {}
+
+  /**
+   * Check for the existence of a word.
+   * @param word the word to be checked.
+   * @return true if the word is in the dictionary,
+   *         false otherwise.
+   **/
+  virtual bool checkWord(const std::string& word) = 0;
+};
+
+US_DECLARE_SERVICE_INTERFACE(DictionaryService, "DictionaryService/1.0")
+
+#endif // DICTIONARYSERVICE_H
diff --git a/Core/Code/CppMicroServices/documentation/snippets/uServices-dictionaryservice/main.cpp b/Core/Code/CppMicroServices/documentation/snippets/uServices-dictionaryservice/main.cpp
new file mode 100644
index 0000000000..3fd7bf4df5
--- /dev/null
+++ b/Core/Code/CppMicroServices/documentation/snippets/uServices-dictionaryservice/main.cpp
@@ -0,0 +1,119 @@
+
+//! [Activator]
+#include "DictionaryService.h"
+
+#include <usModuleActivator.h>
+#include <usModuleContext.h>
+#include <usServiceProperties.h>
+
+// Replace that include with your own base class declaration
+#include US_BASECLASS_HEADER
+
+#include <algorithm>
+#include <memory>
+
+US_USE_NAMESPACE
+
+/**
+ * This class implements a module activator that uses the module
+ * context to register an English language dictionary service
+ * with the C++ Micro Services registry during static initialization
+ * of the module. The dictionary service interface is
+ * defined in a separate file and is implemented by a nested class.
+ */
+class US_ABI_LOCAL MyActivator : public ModuleActivator
+{
+
+private:
+
+  /**
+   * A private inner class that implements a dictionary service;
+   * see DictionaryService for details of the service.
+   */
+  class DictionaryImpl : public US_BASECLASS_NAME, public DictionaryService
+  {
+    // The set of words contained in the dictionary.
+    US_UNORDERED_SET_TYPE<std::string> m_dictionary;
+
+  public:
+
+    DictionaryImpl()
+    {
+      m_dictionary.insert("welcome");
+      m_dictionary.insert("to");
+      m_dictionary.insert("the");
+      m_dictionary.insert("micro");
+      m_dictionary.insert("services");
+      m_dictionary.insert("tutorial");
+    }
+
+    /**
+     * Implements DictionaryService.checkWord(). Determines
+     * if the passed in word is contained in the dictionary.
+     * @param word the word to be checked.
+     * @return true if the word is in the dictionary,
+     *         false otherwise.
+     **/
+    bool checkWord(const std::string& word)
+    {
+      std::string lword(word);
+      std::transform(lword.begin(), lword.end(), lword.begin(), ::tolower);
+
+      return m_dictionary.find(lword) != m_dictionary.end();
+    }
+  };
+
+  std::auto_ptr<DictionaryImpl> m_dictionaryService;
+
+
+public:
+
+  /**
+   * Implements ModuleActivator::Load(). Registers an
+   * instance of a dictionary service using the module context;
+   * attaches properties to the service that can be queried
+   * when performing a service look-up.
+   * @param context the context for the module.
+   */
+  void Load(ModuleContext* context)
+  {
+    m_dictionaryService.reset(new DictionaryImpl);
+    ServiceProperties props;
+    props["Language"] = std::string("English");
+    context->RegisterService<DictionaryService>(m_dictionaryService.get(), props);
+  }
+
+  /**
+   * Implements ModuleActivator::Unload(). Does nothing since
+   * the C++ Micro Services library will automatically unregister any registered services.
+   * @param context the context for the module.
+   */
+  void Unload(ModuleContext* /*context*/)
+  {
+    // NOTE: The service is automatically unregistered
+  }
+
+};
+
+US_EXPORT_MODULE_ACTIVATOR(DictionaryServiceModule, MyActivator)
+//![Activator]
+
+#include <usModuleInitialization.h>
+
+US_INITIALIZE_MODULE("DictionaryServiceModule", "", "", "1.0.0")
+
+int main(int /*argc*/, char* /*argv*/[])
+{
+  //![GetDictionaryService]
+  ServiceReference dictionaryServiceRef = GetModuleContext()->GetServiceReference<DictionaryService>();
+  if (dictionaryServiceRef)
+  {
+    DictionaryService* dictionaryService = GetModuleContext()->GetService<DictionaryService>(dictionaryServiceRef);
+    if (dictionaryService)
+    {
+      std::cout << "Dictionary contains 'Tutorial': " << dictionaryService->checkWord("Tutorial") << std::endl;
+    }
+  }
+  //![GetDictionaryService]
+  return 0;
+}
diff --git a/Core/Code/CppMicroServices/documentation/snippets/uServices-modulecontext/main.cpp b/Core/Code/CppMicroServices/documentation/snippets/uServices-modulecontext/main.cpp
new file mode 100644
index 0000000000..2afb314c9a
--- /dev/null
+++ b/Core/Code/CppMicroServices/documentation/snippets/uServices-modulecontext/main.cpp
@@ -0,0 +1,27 @@
+#include <usModuleActivator.h>
+
+//! [InitializeModule]
+#include <usModuleInitialization.h>
+
+US_INITIALIZE_MODULE("My Module", "mylibname", "", "1.0.0")
+//! [InitializeModule]
+
+//! [GetModuleContext]
+#include <usGetModuleContext.h>
+#include <usModule.h>
+
+US_USE_NAMESPACE
+
+void RetrieveModuleContext()
+{
+  ModuleContext* context = GetModuleContext();
+  Module* module = context->GetModule();
+  std::cout << "Module name: " << module->GetName() << " [id: " << module->GetModuleId() << "]\n";
+}
+//! [GetModuleContext]
+
+int main(int /*argc*/, char* /*argv*/[])
+{
+  RetrieveModuleContext();
+  return 0;
+}
diff --git a/Core/Code/CppMicroServices/documentation/snippets/uServices-singleton/SingletonOne.h b/Core/Code/CppMicroServices/documentation/snippets/uServices-singleton/SingletonOne.h
index 9c52c9dd4d..a8aa153e56 100644
--- a/Core/Code/CppMicroServices/documentation/snippets/uServices-singleton/SingletonOne.h
+++ b/Core/Code/CppMicroServices/documentation/snippets/uServices-singleton/SingletonOne.h
@@ -1,67 +1,66 @@
 #ifndef SINGLETONONE_H
 #define SINGLETONONE_H
 
 #include <usConfig.h>
 #include <usServiceInterface.h>
 #include <usServiceReference.h>
 #include <usServiceRegistration.h>
 
 #include US_BASECLASS_HEADER
 
-namespace mitk { class ModuleContext; }
 
 //![s1]
 class SingletonOne
 {
 public:
 
   static SingletonOne& GetInstance();
 
   // Just some member
   int a;
 
 private:
 
   SingletonOne();
   ~SingletonOne();
 
   // Disable copy constructor and assignment operator.
   SingletonOne(const SingletonOne&);
   SingletonOne& operator=(const SingletonOne&);
 };
 //![s1]
 
 class SingletonTwoService;
 
 //![ss1]
 class SingletonOneService : public US_BASECLASS_NAME
 {
 public:
 
   // This will return a SingletonOneService instance with the
   // lowest service id at the time this method was called the first
   // time and returned a non-null value (which is usually the instance
   // which was registered first). A null-pointer is returned if no
   // instance was registered yet.
   static SingletonOneService* GetInstance();
 
   int a;
 
 private:
 
   // Only our module activator class should be able to instantiate
   // a SingletonOneService object.
   friend class MyActivator;
 
   SingletonOneService();
   ~SingletonOneService();
 
   // Disable copy constructor and assignment operator.
   SingletonOneService(const SingletonOneService&);
   SingletonOneService& operator=(const SingletonOneService&);
 };
 
 US_DECLARE_SERVICE_INTERFACE(SingletonOneService, "org.cppmicroservices.snippet.SingletonOneService")
 //![ss1]
 
 #endif // SINGLETONONE_H
diff --git a/Core/Code/CppMicroServices/documentation/snippets/uServices-singleton/files.cmake b/Core/Code/CppMicroServices/documentation/snippets/uServices-singleton/files.cmake
index 63d0db051e..640356da1a 100644
--- a/Core/Code/CppMicroServices/documentation/snippets/uServices-singleton/files.cmake
+++ b/Core/Code/CppMicroServices/documentation/snippets/uServices-singleton/files.cmake
@@ -1,12 +1,11 @@
 
 set(snippet_src_files
   main.cpp
   SingletonOne.cpp
   SingletonTwo.cpp
 )
 
 usFunctionGenerateModuleInit(snippet_src_files
                              NAME "uServices_singleton"
-                             LIBRARY_NAME ""
-                             DEPENDS ""
+                             EXECUTABLE
                             )
diff --git a/Core/Code/CppMicroServices/documentation/snippets/uServices-singleton/main.cpp b/Core/Code/CppMicroServices/documentation/snippets/uServices-singleton/main.cpp
index ea5ef7ed07..b9257272cd 100644
--- a/Core/Code/CppMicroServices/documentation/snippets/uServices-singleton/main.cpp
+++ b/Core/Code/CppMicroServices/documentation/snippets/uServices-singleton/main.cpp
@@ -1,69 +1,69 @@
 #include <usConfig.h>
 #include <usModuleActivator.h>
 #include <usModuleContext.h>
 
 #include "SingletonOne.h"
 #include "SingletonTwo.h"
 
 US_USE_NAMESPACE
 
 class MyActivator : public ModuleActivator
 {
 
 public:
 
   //![0]
   void Load(ModuleContext* context)
   {
     // The Load() method of the module activator is called during static
     // initialization time of the shared library.
 
     // First create and register a SingletonTwoService instance.
     m_SingletonTwo = new SingletonTwoService;
     m_SingletonTwoReg = context->RegisterService<SingletonTwoService>(m_SingletonTwo);
 
     // Now the SingletonOneService constructor will get a valid
     // SingletonTwoService instance.
     m_SingletonOne = new SingletonOneService;
     m_SingletonOneReg = context->RegisterService<SingletonOneService>(m_SingletonOne);
   }
   //![0]
   
   //![1]
   void Unload(ModuleContext* /*context*/)
   {
     // Services are automatically unregistered during unloading of
-    // the shared library after the call to Unload(mitk::ModuleContext*)
+    // the shared library after the call to Unload(ModuleContext*)
     // has returned.
 
     // Since SingletonOneService needs a non-null SingletonTwoService
     // instance in its destructor, we explicitly unregister and delete the
     // SingletonOneService instance here. This way, the SingletonOneService
     // destructor will still get a valid SingletonTwoService instance.
     m_SingletonOneReg.Unregister();
     delete m_SingletonOne;
 
     // For singletonTwoService, we could rely on the automatic unregistering
     // by the service registry and on automatic deletion if you used
     // smart pointer reference counting. You must not delete service instances
     // in this method without unregistering them first.
     m_SingletonTwoReg.Unregister();
     delete m_SingletonTwo;
   }
   //![1]
 
 private:
 
   SingletonOneService* m_SingletonOne;
   SingletonTwoService* m_SingletonTwo;
 
   ServiceRegistration m_SingletonOneReg;
   ServiceRegistration m_SingletonTwoReg;
 
 };
 
 US_EXPORT_MODULE_ACTIVATOR(uServices_singleton, MyActivator)
 
 int main()
 {
 }
diff --git a/Core/Code/CppMicroServices/src/CMakeLists.txt b/Core/Code/CppMicroServices/src/CMakeLists.txt
index 78808ae0e1..b9d2c64ec5 100644
--- a/Core/Code/CppMicroServices/src/CMakeLists.txt
+++ b/Core/Code/CppMicroServices/src/CMakeLists.txt
@@ -1,168 +1,163 @@
 #-----------------------------------------------------------------------------
 # US source files
 #-----------------------------------------------------------------------------
 
 set(_srcs
   util/usAny.cpp
   util/usThreads.cpp
   util/usUtils.cpp
 
   service/usLDAPExpr.cpp
   service/usLDAPFilter.cpp
   service/usServiceException.cpp
   service/usServiceEvent.cpp
   service/usServiceListenerEntry.cpp
   service/usServiceListenerEntry_p.h
   service/usServiceListeners.cpp
   service/usServiceListeners_p.h
   service/usServiceProperties.cpp
   service/usServiceReference.cpp
   service/usServiceReferencePrivate.cpp
   service/usServiceRegistration.cpp
   service/usServiceRegistrationPrivate.cpp
   service/usServiceRegistry.cpp
   service/usServiceRegistry_p.h
 
   module/usCoreModuleContext_p.h
   module/usCoreModuleContext.cpp
   module/usModuleContext.cpp
   module/usModule.cpp
   module/usModuleEvent.cpp
   module/usModuleInfo.cpp
   module/usModulePrivate.cpp
   module/usModuleRegistry.cpp
   module/usModuleUtils.cpp
   module/usModuleVersion.cpp
 )
 
 set(_private_headers
-  util/usAtomicInt.h
-  util/usExportMacros.h
-  util/usFunctor.h
-  util/usStaticInit.h
-  util/usThreads.h
-  util/usUtils.h
+  util/usAtomicInt_p.h
+  util/usFunctor_p.h
+  util/usStaticInit_p.h
+  util/usThreads_p.h
+  util/usUtils_p.h
   
   service/usServiceTracker.tpp
   service/usServiceTrackerPrivate.h
   service/usServiceTrackerPrivate.tpp
-  service/usTrackedService.h
-  service/usTrackedServiceListener.h
+  service/usTrackedService_p.h
+  service/usTrackedServiceListener_p.h
   service/usTrackedService.tpp
   
-  module/usModuleAbstractTracked.h
+  module/usModuleAbstractTracked_p.h
   module/usModuleAbstractTracked.tpp
-  module/usModuleUtils.h
+  module/usModuleUtils_p.h
 )
 
 set(_public_headers
   util/usAny.h
   util/usSharedData.h
   
   service/usLDAPFilter.h
   service/usServiceEvent.h
   service/usServiceException.h
   service/usServiceInterface.h
   service/usServiceProperties.h
   service/usServiceReference.h
   service/usServiceRegistration.h
   service/usServiceTracker.h
   service/usServiceTrackerCustomizer.h
   
   module/usGetModuleContext.h
   module/usModule.h
   module/usModuleActivator.h
   module/usModuleContext.h
   module/usModuleEvent.h
   module/usModuleInfo.h
+  module/usModuleInitialization.h
   module/usModuleRegistry.h
-  module/usModuleUtils.h
   module/usModuleVersion.h
 )
 
 if(_us_baseclass_default)
   list(APPEND _public_headers util/usBase.h)
 endif()
 
-if(US_ENABLE_THREADING_SUPPORT)
-  list(APPEND _public_headers util/usThreads.h)
-endif()
-
 if(US_ENABLE_SERVICE_FACTORY_SUPPORT)
   list(APPEND _public_headers service/usServiceFactory.h)
 endif()
 
 if(US_IS_EMBEDDED)
   set(US_SOURCES )
   get_filename_component(_path_prefix "${PROJECT_SOURCE_DIR}" NAME)
   set(_path_prefix "${_path_prefix}/src")
   foreach(_src ${_srcs} ${_public_headers} ${_private_headers})
     list(APPEND US_SOURCES ${_path_prefix}/${_src})
   endforeach()
   set(US_SOURCES ${US_SOURCES} PARENT_SCOPE)
 endif()
 
 #-----------------------------------------------------------------------------
 # Create library (only if not in embedded mode)
 #-----------------------------------------------------------------------------
 
 if(NOT US_IS_EMBEDDED)
   include_directories(${US_INTERNAL_INCLUDE_DIRS})
   if(US_LINK_DIRS)
     link_directories(${US_LINK_DIRS})
   endif()
 
   if(US_BUILD_SHARED_LIBS)
     usFunctionGenerateModuleInit(_srcs NAME ${PROJECT_NAME} VERSION "0.9.0")
   endif()
 
   add_library(${PROJECT_NAME} ${_srcs} ${_public_headers} ${_private_headers})
   set_property(TARGET ${PROJECT_NAME} PROPERTY FRAMEWORK 1)
   if(US_LINK_LIBRARIES)
     target_link_libraries(${PROJECT_NAME} ${US_LINK_LIBRARIES})
   endif()
 endif()
 
 #-----------------------------------------------------------------------------
 # Configure public header wrappers
 #-----------------------------------------------------------------------------
 
 set(US_PUBLIC_HEADERS ${_public_headers})
 if(US_HEADER_PREFIX)
   set(US_PUBLIC_HEADERS )
   foreach(_public_header ${_public_headers})
     get_filename_component(_public_header_basename ${_public_header} NAME_WE)
     set(_us_public_header ${_public_header_basename}.h)
     string(SUBSTRING "${_public_header_basename}" 2 -1 _public_header_basename)
     set(_header_wrapper "${PROJECT_BINARY_DIR}/include/${US_HEADER_PREFIX}${_public_header_basename}.h")
     configure_file(${PROJECT_SOURCE_DIR}/CMake/usPublicHeaderWrapper.h.in ${_header_wrapper} @ONLY)
     list(APPEND US_PUBLIC_HEADERS ${_header_wrapper})
   endforeach()
 endif()
 
 foreach(_header ${_public_headers} ${_private_headers})
   get_filename_component(_header_name "${_header}" NAME)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_header} "${PROJECT_BINARY_DIR}/include/${_header_name}")
 endforeach()
 
 if(NOT US_IS_EMBEDDED)
-  set_property(TARGET ${PROJECT_NAME} PROPERTY PUBLIC_HEADER ${US_PUBLIC_HEADERS})
+  set_property(TARGET ${PROJECT_NAME} PROPERTY PUBLIC_HEADER ${US_PUBLIC_HEADERS} ${us_config_h_file})
   set_property(TARGET ${PROJECT_NAME} PROPERTY PRIVATE_HEADER ${_private_headers})
 else()
   set(US_PUBLIC_HEADERS ${US_PUBLIC_HEADERS} PARENT_SCOPE)
   set(US_PRIVATE_HEADERS ${US_PRIVATE_HEADERS} PARENT_SCOPE)
 endif()
 
 #-----------------------------------------------------------------------------
 # Install support (only if not in embedded mode)
 #-----------------------------------------------------------------------------
 
 if(NOT US_IS_EMBEDDED)
   install(TARGETS ${PROJECT_NAME} FRAMEWORK DESTINATION .
                                   RUNTIME DESTINATION bin
                                   LIBRARY DESTINATION lib
                                   ARCHIVE DESTINATION lib 
                                   PUBLIC_HEADER DESTINATION include
                                   PRIVATE_HEADER DESTINATION include)
 endif()
 
diff --git a/Core/Code/CppMicroServices/src/module/usGetModuleContext.h b/Core/Code/CppMicroServices/src/module/usGetModuleContext.h
index 93365aa7d7..c5928890c5 100644
--- a/Core/Code/CppMicroServices/src/module/usGetModuleContext.h
+++ b/Core/Code/CppMicroServices/src/module/usGetModuleContext.h
@@ -1,50 +1,50 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #ifndef USGETMODULECONTEXT_H
 #define USGETMODULECONTEXT_H
 
-#include <usExportMacros.h>
+#include <usConfig.h>
 
 US_BEGIN_NAMESPACE
 
 class ModuleContext;
 
 /**
  * Returns the module context of the calling module.
  *
  * This function allows easy access to the own ModuleContext instance from
- * inside a US module.
+ * inside a C++ Micro Services module.
  *
  * \internal
  *
  * Note that the corresponding function definition is provided for each
- * module by the mitkModuleInit.cpp file. This file is customized via CMake
- * configure_file(...) and automatically compiled into each US module.
+ * module by the usModuleInit.cpp file. This file is customized via CMake
+ * configure_file(...) and automatically compiled into each module.
  * Consequently, the GetModuleContext function is not exported, since each
  * module gets its "own version".
  */
 US_ABI_LOCAL ModuleContext* GetModuleContext();
 
 US_END_NAMESPACE
 
 #endif // USGETMODULECONTEXT_H
diff --git a/Core/Code/CppMicroServices/src/module/usModule.cpp b/Core/Code/CppMicroServices/src/module/usModule.cpp
index 58e307a3b7..12b5593ab9 100644
--- a/Core/Code/CppMicroServices/src/module/usModule.cpp
+++ b/Core/Code/CppMicroServices/src/module/usModule.cpp
@@ -1,230 +1,230 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #include "usModule.h"
 
 #include "usModuleContext.h"
 #include "usModuleActivator.h"
 #include "usModulePrivate.h"
 #include "usCoreModuleContext_p.h"
 
 
 US_BEGIN_NAMESPACE
 
 const std::string& Module::PROP_ID()
 {
   static const std::string s("module.id");
   return s;
 }
 const std::string& Module::PROP_NAME()
 {
   static const std::string s("module.name");
   return s;
 }
 const std::string& Module::PROP_LOCATION()
 {
   static const std::string s("module.location");
   return s;
 }
 const std::string& Module::PROP_MODULE_DEPENDS()
 {
   static const std::string s("module.module_depends");
   return s;
 }
 const std::string& Module::PROP_LIB_DEPENDS()
 {
   static const std::string s("module.lib_depends");
   return s;
 }
 const std::string& Module::PROP_VERSION()
 {
   static const std::string s("module.version");
   return s;
 }
 
 Module::Module()
 : d(0)
 {
 
 }
 
 Module::~Module()
 {
   delete d;
 }
 
 void Module::Init(CoreModuleContext* coreCtx,
                   ModuleInfo* info)
 {
   ModulePrivate* mp = new ModulePrivate(this, coreCtx, info);
   std::swap(mp, d);
   delete mp;
 }
 
 void Module::Uninit()
 {
   if (d->moduleContext)
   {
     delete d->moduleContext;
     d->moduleContext = 0;
   }
   d->moduleActivator = 0;
 }
 
 bool Module::IsLoaded() const
 {
   return d->moduleContext != 0;
 }
 
 void Module::Start()
 {
 
   if (d->moduleContext)
   {
     US_WARN << "Module " << d->info.name << " already started.";
     return;
   }
 
   d->moduleContext = new ModuleContext(this->d);
 
 //  try
 //  {
     d->coreCtx->listeners.ModuleChanged(ModuleEvent(ModuleEvent::LOADING, this));
     // try to get a ModuleActivator instance
     if (d->info.activatorHook)
     {
       try
       {
         d->moduleActivator = d->info.activatorHook();
       }
       catch (...)
       {
         US_ERROR << "Creating the module activator of " << d->info.name << " failed";
         throw;
       }
 
       d->moduleActivator->Load(d->moduleContext);
     }
 
     d->coreCtx->listeners.ModuleChanged(ModuleEvent(ModuleEvent::LOADED, this));
 //  }
 //  catch (...)
 //  {
 //    d->coreCtx->listeners.ModuleChanged(ModuleEvent(ModuleEvent::UNLOADING, this));
 //    d->RemoveModuleResources();
 
 //    delete d->moduleContext;
 //    d->moduleContext = 0;
 
 //    d->coreCtx->listeners.ModuleChanged(ModuleEvent(ModuleEvent::UNLOADED, this));
 //    US_ERROR << "Calling the module activator Load() method of " << d->info.name << " failed!";
 //    throw;
 //  }
 }
 
 void Module::Stop()
 {
   if (d->moduleContext == 0)
   {
     US_WARN << "Module " << d->info.name << " already stopped.";
     return;
   }
 
   try
   {
     d->coreCtx->listeners.ModuleChanged(ModuleEvent(ModuleEvent::UNLOADING, this));
     if (d->moduleActivator)
     {
       d->moduleActivator->Unload(d->moduleContext);
     }
   }
   catch (...)
   {
-    US_ERROR << "Calling the module activator Unload() method of " << d->info.name << " failed!";
+    US_WARN << "Calling the module activator Unload() method of " << d->info.name << " failed!";
 
     try
     {
       d->RemoveModuleResources();
     }
     catch (...) {}
 
     delete d->moduleContext;
     d->moduleContext = 0;
 
     d->coreCtx->listeners.ModuleChanged(ModuleEvent(ModuleEvent::UNLOADED, this));
 
     throw;
   }
 
   d->RemoveModuleResources();
   delete d->moduleContext;
   d->moduleContext = 0;
   d->coreCtx->listeners.ModuleChanged(ModuleEvent(ModuleEvent::UNLOADED, this));
 }
 
 ModuleContext* Module::GetModuleContext() const
 {
   return d->moduleContext;
 }
 
 long Module::GetModuleId() const
 {
   return d->info.id;
 }
 
 std::string Module::GetLocation() const
 {
   return d->info.location;
 }
 
 std::string Module::GetName() const
 {
   return d->info.name;
 }
 
 ModuleVersion Module::GetVersion() const
 {
   return d->version;
 }
 
 std::string Module::GetProperty(const std::string& key) const
 {
   if (d->properties.count(key) == 0) return "";
   return d->properties[key];
 }
 
 US_END_NAMESPACE
 
 US_USE_NAMESPACE
 
 std::ostream& operator<<(std::ostream& os, const Module& module)
 {
   os << "Module[" << "id=" << module.GetModuleId() <<
         ", loc=" << module.GetLocation() <<
         ", name=" << module.GetName() << "]";
   return os;
 }
 
 std::ostream& operator<<(std::ostream& os, Module const * module)
 {
   return operator<<(os, *module);
 }
diff --git a/Core/Code/CppMicroServices/src/module/usModuleAbstractTracked.tpp b/Core/Code/CppMicroServices/src/module/usModuleAbstractTracked.tpp
index cb7dcb5bc7..a40324c462 100644
--- a/Core/Code/CppMicroServices/src/module/usModuleAbstractTracked.tpp
+++ b/Core/Code/CppMicroServices/src/module/usModuleAbstractTracked.tpp
@@ -1,314 +1,314 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
-#include <usUtils.h>
+#include <usUtils_p.h>
 
 US_BEGIN_NAMESPACE
 
 template<class S, class T, class R>
 const bool ModuleAbstractTracked<S,T,R>::DEBUG = false;
 
 template<class S, class T, class R>
 ModuleAbstractTracked<S,T,R>::ModuleAbstractTracked()
 {
   closed = false;
 }
 
 template<class S, class T, class R>
 ModuleAbstractTracked<S,T,R>::~ModuleAbstractTracked()
 {
 
 }
 
 template<class S, class T, class R>
 void ModuleAbstractTracked<S,T,R>::SetInitial(const std::list<S>& initiallist)
 {
   initial = initiallist;
 
   if (DEBUG)
   {
     for(typename std::list<S>::const_iterator item = initiallist.begin();
       item != initiallist.end(); ++item)
     {
       US_DEBUG << "ModuleAbstractTracked::setInitial: " << (*item);
     }
   }
 }
 
 template<class S, class T, class R>
 void ModuleAbstractTracked<S,T,R>::TrackInitial()
 {
   while (true)
   {
     S item(0);
     {
       typename Self::Lock l(this);
       if (closed || (initial.size() == 0))
       {
         /*
          * if there are no more initial items
          */
         return; /* we are done */
       }
       /*
        * move the first item from the initial list to the adding list
        * within this synchronized block.
        */
       item = initial.front();
       initial.pop_front();
       if (tracked[item])
       {
         /* if we are already tracking this item */
         US_DEBUG(DEBUG) << "ModuleAbstractTracked::trackInitial[already tracked]: " << item;
         continue; /* skip this item */
       }
       if (std::find(adding.begin(), adding.end(), item) != adding.end())
       {
         /*
          * if this item is already in the process of being added.
          */
         US_DEBUG(DEBUG) << "ModuleAbstractTracked::trackInitial[already adding]: " << item;
         continue; /* skip this item */
       }
       adding.push_back(item);
     }
     US_DEBUG(DEBUG) << "ModuleAbstractTracked::trackInitial: " << item;
     TrackAdding(item, R());
     /*
      * Begin tracking it. We call trackAdding
      * since we have already put the item in the
      * adding list.
      */
   }
 }
 
 template<class S, class T, class R>
 void ModuleAbstractTracked<S,T,R>::Close()
 {
   closed = true;
 }
 
 template<class S, class T, class R>
 void ModuleAbstractTracked<S,T,R>::Track(S item, R related)
 {
   T object(0);
   {
     typename Self::Lock l(this);
     if (closed)
     {
       return;
     }
     object = tracked[item];
     if (!object)
     { /* we are not tracking the item */
       if (std::find(adding.begin(), adding.end(),item) != adding.end())
       {
         /* if this item is already in the process of being added. */
         US_DEBUG(DEBUG) << "ModuleAbstractTracked::track[already adding]: " << item;
         return;
       }
       adding.push_back(item); /* mark this item is being added */
     }
     else
     { /* we are currently tracking this item */
       US_DEBUG(DEBUG) << "ModuleAbstractTracked::track[modified]: " << item;
       Modified(); /* increment modification count */
     }
   }
 
   if (!object)
   { /* we are not tracking the item */
     TrackAdding(item, related);
   }
   else
   {
     /* Call customizer outside of synchronized region */
     CustomizerModified(item, related, object);
     /*
      * If the customizer throws an unchecked exception, it is safe to
      * let it propagate
      */
   }
 }
 
 template<class S, class T, class R>
 void ModuleAbstractTracked<S,T,R>::Untrack(S item, R related)
 {
   T object(0);
   {
     typename Self::Lock l(this);
     std::size_t initialSize = initial.size();
     initial.remove(item);
     if (initialSize != initial.size())
     { /* if this item is already in the list
        * of initial references to process
        */
       US_DEBUG(DEBUG) << "ModuleAbstractTracked::untrack[removed from initial]: " << item;
       return; /* we have removed it from the list and it will not be
                * processed
                */
     }
 
     std::size_t addingSize = adding.size();
     adding.remove(item);
     if (addingSize != adding.size())
     { /* if the item is in the process of
        * being added
        */
       US_DEBUG(DEBUG) << "ModuleAbstractTracked::untrack[being added]: " << item;
       return; /*
            * in case the item is untracked while in the process of
            * adding
            */
     }
     object = tracked[item];
     /*
      * must remove from tracker before
      * calling customizer callback
      */
     tracked.erase(item);
     if (!object)
     { /* are we actually tracking the item */
       return;
     }
     Modified(); /* increment modification count */
   }
   US_DEBUG(DEBUG) << "ModuleAbstractTracked::untrack[removed]: " << item;
   /* Call customizer outside of synchronized region */
   CustomizerRemoved(item, related, object);
   /*
    * If the customizer throws an unchecked exception, it is safe to let it
    * propagate
    */
 }
 
 template<class S, class T, class R>
 std::size_t ModuleAbstractTracked<S,T,R>::Size() const
 {
   return tracked.size();
 }
 
 template<class S, class T, class R>
 bool ModuleAbstractTracked<S,T,R>::IsEmpty() const
 {
   return tracked.empty();
 }
 
 template<class S, class T, class R>
 T ModuleAbstractTracked<S,T,R>::GetCustomizedObject(S item) const
 {
   typename TrackingMap::const_iterator i = tracked.find(item);
   if (i != tracked.end()) return i->second;
   return T();
 }
 
 template<class S, class T, class R>
 void ModuleAbstractTracked<S,T,R>::GetTracked(std::list<S>& items) const
 {
   for (typename TrackingMap::const_iterator i = tracked.begin();
        i != tracked.end(); ++i)
   {
     items.push_back(i->first);
   }
 }
 
 template<class S, class T, class R>
 void ModuleAbstractTracked<S,T,R>::Modified()
 {
   trackingCount.Ref();
 }
 
 template<class S, class T, class R>
 int ModuleAbstractTracked<S,T,R>::GetTrackingCount() const
 {
   return trackingCount;
 }
 
 template<class S, class T, class R>
 void ModuleAbstractTracked<S,T,R>::CopyEntries(TrackingMap& map) const
 {
   map.insert(tracked.begin(), tracked.end());
 }
 
 template<class S, class T, class R>
 bool ModuleAbstractTracked<S,T,R>::CustomizerAddingFinal(S item, const T& custom)
 {
   typename Self::Lock l(this);
   std::size_t addingSize = adding.size();
   adding.remove(item);
   if (addingSize != adding.size() && !closed)
   {
     /*
      * if the item was not untracked during the customizer
      * callback
      */
     if (custom)
     {
       tracked[item] = custom;
       Modified(); /* increment modification count */
       this->NotifyAll(); /* notify any waiters */
     }
     return false;
   }
   else
   {
     return true;
   }
 }
 
 template<class S, class T, class R>
 void ModuleAbstractTracked<S,T,R>::TrackAdding(S item, R related)
 {
   US_DEBUG(DEBUG) << "ModuleAbstractTracked::trackAdding:" << item;
   T object(0);
   bool becameUntracked = false;
   /* Call customizer outside of synchronized region */
   try
   {
     object = CustomizerAdding(item, related);
     becameUntracked = this->CustomizerAddingFinal(item, object);
   }
   catch (...)
   {
     /*
      * If the customizer throws an exception, it will
      * propagate after the cleanup code.
      */
     this->CustomizerAddingFinal(item, object);
     throw;
   }
 
   /*
    * The item became untracked during the customizer callback.
    */
   if (becameUntracked && object)
   {
     US_DEBUG(DEBUG) << "ModuleAbstractTracked::trackAdding[removed]: " << item;
     /* Call customizer outside of synchronized region */
     CustomizerRemoved(item, related, object);
     /*
      * If the customizer throws an unchecked exception, it is safe to
      * let it propagate
      */
   }
 }
 
 US_END_NAMESPACE
diff --git a/Core/Code/CppMicroServices/src/module/usModuleAbstractTracked.h b/Core/Code/CppMicroServices/src/module/usModuleAbstractTracked_p.h
similarity index 99%
rename from Core/Code/CppMicroServices/src/module/usModuleAbstractTracked.h
rename to Core/Code/CppMicroServices/src/module/usModuleAbstractTracked_p.h
index af4ddb5f65..a0751c4881 100644
--- a/Core/Code/CppMicroServices/src/module/usModuleAbstractTracked.h
+++ b/Core/Code/CppMicroServices/src/module/usModuleAbstractTracked_p.h
@@ -1,291 +1,291 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #ifndef USMODULEABSTRACTTRACKED_H
 #define USMODULEABSTRACTTRACKED_H
 
 #include <list>
 
-#include "usAtomicInt.h"
+#include "usAtomicInt_p.h"
 #include "usAny.h"
 
 US_BEGIN_NAMESPACE
 
 /**
  * This class is not intended to be used directly. It is exported to support
  * the US module system.
  *
  * Abstract class to track items. If a Tracker is reused (closed then reopened),
  * then a new ModuleAbstractTracked object is used. This class acts as a map of tracked
  * item -> customized object. Subclasses of this class will act as the listener
  * object for the tracker. This class is used to synchronize access to the
  * tracked items. This is not a public class. It is only for use by the
  * implementation of the Tracker class.
  *
  * @tparam S The tracked item. It is the key.
  * @tparam T The value mapped to the tracked item.
  * @tparam R The reason the tracked item is  being tracked or untracked.
  * @ThreadSafe
  */
 template<class S, class T, class R>
 class ModuleAbstractTracked : public US_DEFAULT_THREADING<ModuleAbstractTracked<S,T,R> >
 {
 
 public:
 
   /* set this to true to compile in debug messages */
   static const bool DEBUG; // = false;
 
   typedef std::map<S,T> TrackingMap;
 
   /**
    * ModuleAbstractTracked constructor.
    */
   ModuleAbstractTracked();
 
   virtual ~ModuleAbstractTracked();
 
   /**
    * Set initial list of items into tracker before events begin to be
    * received.
    *
    * This method must be called from Tracker's open method while synchronized
    * on this object in the same synchronized block as the add listener call.
    *
    * @param list The initial list of items to be tracked. <code>null</code>
    *        entries in the list are ignored.
    * @GuardedBy this
    */
   void SetInitial(const std::list<S>& list);
 
   /**
    * Track the initial list of items. This is called after events can begin to
    * be received.
    *
    * This method must be called from Tracker's open method while not
    * synchronized on this object after the add listener call.
    *
    */
   void TrackInitial();
 
   /**
    * Called by the owning Tracker object when it is closed.
    */
   void Close();
 
   /**
    * Begin to track an item.
    *
    * @param item S to be tracked.
    * @param related Action related object.
    */
   void Track(S item, R related);
 
   /**
    * Discontinue tracking the item.
    *
    * @param item S to be untracked.
    * @param related Action related object.
    */
   void Untrack(S item, R related);
 
   /**
    * Returns the number of tracked items.
    *
    * @return The number of tracked items.
    *
    * @GuardedBy this
    */
   std::size_t Size() const;
 
   /**
    * Returns if the tracker is empty.
    *
    * @return Whether the tracker is empty.
    *
    * @GuardedBy this
    */
   bool IsEmpty() const;
 
   /**
    * Return the customized object for the specified item
    *
    * @param item The item to lookup in the map
    * @return The customized object for the specified item.
    *
    * @GuardedBy this
    */
   T GetCustomizedObject(S item) const;
 
   /**
    * Return the list of tracked items.
    *
    * @return The tracked items.
    * @GuardedBy this
    */
   void GetTracked(std::list<S>& items) const;
 
   /**
    * Increment the modification count. If this method is overridden, the
    * overriding method MUST call this method to increment the tracking count.
    *
    * @GuardedBy this
    */
   virtual void Modified();
 
   /**
    * Returns the tracking count for this <code>ServiceTracker</code> object.
    *
    * The tracking count is initialized to 0 when this object is opened. Every
    * time an item is added, modified or removed from this object the tracking
    * count is incremented.
    *
    * @GuardedBy this
    * @return The tracking count for this object.
    */
   int GetTrackingCount() const;
 
   /**
    * Copy the tracked items and associated values into the specified map.
    *
    * @param map The map into which to copy the tracked items and associated
    *        values. This map must not be a user provided map so that user code
    *        is not executed while synchronized on this.
    * @return The specified map.
    * @GuardedBy this
    */
   void CopyEntries(TrackingMap& map) const;
 
   /**
    * Call the specific customizer adding method. This method must not be
    * called while synchronized on this object.
    *
    * @param item S to be tracked.
    * @param related Action related object.
    * @return Customized object for the tracked item or <code>null</code> if
    *         the item is not to be tracked.
    */
   virtual T CustomizerAdding(S item, const R& related) = 0;
 
   /**
    * Call the specific customizer modified method. This method must not be
    * called while synchronized on this object.
    *
    * @param item Tracked item.
    * @param related Action related object.
    * @param object Customized object for the tracked item.
    */
   virtual void CustomizerModified(S item, const R& related,
                                   T object) = 0;
 
   /**
    * Call the specific customizer removed method. This method must not be
    * called while synchronized on this object.
    *
    * @param item Tracked item.
    * @param related Action related object.
    * @param object Customized object for the tracked item.
    */
   virtual void CustomizerRemoved(S item, const R& related,
                                  T object) = 0;
 
   /**
    * List of items in the process of being added. This is used to deal with
    * nesting of events. Since events may be synchronously delivered, events
    * can be nested. For example, when processing the adding of a service and
    * the customizer causes the service to be unregistered, notification to the
    * nested call to untrack that the service was unregistered can be made to
    * the track method.
    *
    * Since the std::vector implementation is not synchronized, all access to
    * this list must be protected by the same synchronized object for
    * thread-safety.
    *
    * @GuardedBy this
    */
   std::list<S> adding;
 
   /**
    * true if the tracked object is closed.
    *
    * This field is volatile because it is set by one thread and read by
    * another.
    */
   volatile bool closed;
 
   /**
    * Initial list of items for the tracker. This is used to correctly process
    * the initial items which could be modified before they are tracked. This
    * is necessary since the initial set of tracked items are not "announced"
    * by events and therefore the event which makes the item untracked could be
    * delivered before we track the item.
    *
    * An item must not be in both the initial and adding lists at the same
    * time. An item must be moved from the initial list to the adding list
    * "atomically" before we begin tracking it.
    *
    * Since the LinkedList implementation is not synchronized, all access to
    * this list must be protected by the same synchronized object for
    * thread-safety.
    *
    * @GuardedBy this
    */
   std::list<S> initial;
 
   /**
    * Common logic to add an item to the tracker used by track and
    * trackInitial. The specified item must have been placed in the adding list
    * before calling this method.
    *
    * @param item S to be tracked.
    * @param related Action related object.
    */
   void TrackAdding(S item, R related);
 
 private:
 
   typedef ModuleAbstractTracked<S,T,R> Self;
 
   /**
    * Map of tracked items to customized objects.
    *
    * @GuardedBy this
    */
   TrackingMap tracked;
 
   /**
    * Modification count. This field is initialized to zero and incremented by
    * modified.
    *
    * @GuardedBy this
    */
   AtomicInt trackingCount;
 
   bool CustomizerAddingFinal(S item, const T& custom);
 
 };
 
 US_END_NAMESPACE
 
 #include "usModuleAbstractTracked.tpp"
 
 #endif // USMODULEABSTRACTTRACKED_H
diff --git a/Core/Code/CppMicroServices/src/module/usModuleActivator.h b/Core/Code/CppMicroServices/src/module/usModuleActivator.h
index 991cfa2b4c..834505bd7c 100644
--- a/Core/Code/CppMicroServices/src/module/usModuleActivator.h
+++ b/Core/Code/CppMicroServices/src/module/usModuleActivator.h
@@ -1,131 +1,146 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 #ifndef USMODULEACTIVATOR_H_
 #define USMODULEACTIVATOR_H_
 
 #include <usConfig.h>
 
 US_BEGIN_NAMESPACE
 
 class ModuleContext;
 
 /**
  * \ingroup MicroServices
  *
  * Customizes the starting and stopping of a US module.
  * <p>
  * <code>%ModuleActivator</code> is an interface that can be implemented by
  * US modules. The US core can create instances of a
  * module's <code>%ModuleActivator</code> as required. If an instance's
  * <code>moduleActivator::Load</code> method executes successfully, it is
  * guaranteed that the same instance's <code>%ModuleActivator::Unload</code>
  * method will be called when the module is to be unloaded. The US core does
  * not concurrently call a <code>%ModuleActivator</code> object.
  *
  * <p>
  * <code>%ModuleActivator</code> is an abstract class interface whose implementations
  * must be exported via a special macro. Implementations are usually declared
  * and defined directly in .cpp files.
  *
  * <p>
  * \snippet uServices-activator/main.cpp 0
  *
  * <p>
  * The class implementing the <code>%ModuleActivator</code> interface must have a public
  * default constructor so that a <code>%ModuleActivator</code>
  * object can be created by the US core.
  *
  */
 struct ModuleActivator
 {
 
   virtual ~ModuleActivator() {}
 
   /**
    * Called when this module is loaded. This method
    * can be used to register services or to allocate any resources that this
    * module may need globally (during the whole module lifetime).
    *
    * <p>
    * This method must complete and return to its caller in a timely manner.
    *
    * @param context The execution context of the module being loaded.
    * @throws std::exception If this method throws an exception, this
    *         module is marked as stopped and the framework will remove this
    *         module's listeners, unregister all services registered by this
    *         module, and release all services used by this module.
    */
   virtual void Load(ModuleContext* context) = 0;
 
   /**
    * Called when this module is unloaded. In general, this
    * method should undo the work that the <code>ModuleActivator::Load</code>
    * method started. There should be no active threads that were started by
    * this module when this method returns.
    *
    * <p>
    * This method must complete and return to its caller in a timely manner.
    *
    * @param context The execution context of the module being unloaded.
    * @throws std::exception If this method throws an exception, the
    *         module is still marked as unloaded, and the framework will remove
    *         the module's listeners, unregister all services registered by the
    *         module, and release all services used by the module.
    */
   virtual void Unload(ModuleContext* context) = 0;
 
 };
 
 US_END_NAMESPACE
 
+/**
+ * \ingroup MicroServices
+ *
+ * \def US_EXPORT_MODULE_ACTIVATOR(moduleName, type)
+ * \brief Export a module activator class.
+ *
+ * \param _module_libname The physical name of the module, withou prefix or suffix.
+ * \param _activator_type The fully-qualified type-name of the module activator class.
+ *
+ * Call this macro after the definition of your module activator to make it
+ * accessible by the CppMicroServices library.
+ *
+ * Example:
+ * \snippet uServices-activator/main.cpp 0
+ */
 
 #define US_MODULE_ACTIVATOR_INSTANCE_FUNCTION(type)                                     \
   struct ScopedPointer                                                                  \
   {                                                                                     \
     ScopedPointer(US_PREPEND_NAMESPACE(ModuleActivator)* activator = 0) : m_Activator(activator) {} \
     ~ScopedPointer() { delete m_Activator; }                                            \
     US_PREPEND_NAMESPACE(ModuleActivator)* m_Activator;                                 \
   };                                                                                    \
                                                                                         \
   static ScopedPointer activatorPtr;                                                    \
   if (activatorPtr.m_Activator == 0) activatorPtr.m_Activator = new type;               \
   return activatorPtr.m_Activator;
 
 #ifdef US_BUILD_SHARED_LIBS
 
-  #define US_EXPORT_MODULE_ACTIVATOR(moduleName, type)                                  \
-    extern "C" US_ABI_EXPORT US_PREPEND_NAMESPACE(ModuleActivator)* _us_module_activator_instance_ ## moduleName () \
+  #define US_EXPORT_MODULE_ACTIVATOR(_module_libname, _activator_type)                  \
+    extern "C" US_ABI_EXPORT US_PREPEND_NAMESPACE(ModuleActivator)* _us_module_activator_instance_ ## _module_libname () \
     {                                                                                   \
-      US_MODULE_ACTIVATOR_INSTANCE_FUNCTION(type)                                       \
+      US_MODULE_ACTIVATOR_INSTANCE_FUNCTION(_activator_type)                            \
     }
 
 #else
 
-  #define US_EXPORT_MODULE_ACTIVATOR(moduleName, type)                                  \
-    US_PREPEND_NAMESPACE(ModuleActivator)* _us_module_activator_instance_ ## moduleName () \
+  #define US_EXPORT_MODULE_ACTIVATOR(_module_libname, _activator_type)                  \
+    US_PREPEND_NAMESPACE(ModuleActivator)* _us_module_activator_instance_ ## _module_libname () \
     {                                                                                   \
-      US_MODULE_ACTIVATOR_INSTANCE_FUNCTION(type)                                       \
+      US_MODULE_ACTIVATOR_INSTANCE_FUNCTION(_activator_type)                            \
     }
 
 #endif
 
 #endif /* USMODULEACTIVATOR_H_ */
diff --git a/Core/Code/CppMicroServices/src/module/usModuleContext.h b/Core/Code/CppMicroServices/src/module/usModuleContext.h
index 098d1a534e..63b00ced85 100644
--- a/Core/Code/CppMicroServices/src/module/usModuleContext.h
+++ b/Core/Code/CppMicroServices/src/module/usModuleContext.h
@@ -1,638 +1,638 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 #ifndef USMODULECONTEXT_H_
 #define USMODULECONTEXT_H_
 
-#include "usUtils.h"
+#include "usUtils_p.h"
 #include "usServiceInterface.h"
 #include "usServiceEvent.h"
 #include "usServiceRegistration.h"
 #include "usServiceException.h"
 #include "usModuleEvent.h"
 
 US_BEGIN_NAMESPACE
 
 typedef US_SERVICE_LISTENER_FUNCTOR ServiceListener;
 typedef US_MODULE_LISTENER_FUNCTOR ModuleListener;
 
 class ModuleContextPrivate;
 
 /**
  * \ingroup MicroServices
  *
  * A module's execution context within the framework. The context is used to
  * grant access to other methods so that this module can interact with the
  * Micro Services Framework.
  *
  * <p>
  * <code>ModuleContext</code> methods allow a module to:
  * <ul>
  * <li>Subscribe to events published by the framework.
  * <li>Register service objects with the framework service registry.
  * <li>Retrieve <code>ServiceReference</code>s from the framework service
  * registry.
  * <li>Get and release service objects for a referenced service.
  * <li>Get the list of modules loaded in the framework.
  * <li>Get the {@link Module} object for a module.
  * </ul>
  *
  * <p>
  * A <code>ModuleContext</code> object will be created and provided to the
  * module associated with this context when it is loaded using the
  * {@link ModuleActivator::Load} method. The same <code>ModuleContext</code>
  * object will be passed to the module associated with this context when it is
  * unloaded using the {@link ModuleActivator::Unload} method. A
  * <code>ModuleContext</code> object is generally for the private use of its
  * associated module and is not meant to be shared with other modules in the
  * module environment.
  *
  * <p>
  * The <code>Module</code> object associated with a <code>ModuleContext</code>
  * object is called the <em>context module</em>.
  *
  * <p>
  * The <code>ModuleContext</code> object is only valid during the execution of
  * its context module; that is, during the period when the context module
  * is loaded. If the <code>ModuleContext</code>
  * object is used subsequently, a <code>std::logic_error</code> is
  * thrown. The <code>ModuleContext</code> object is never reused after
  * its context module is unloaded.
  *
  * <p>
  * The framework is the only entity that can create <code>ModuleContext</code>
  * objects.
  *
  * @remarks This class is thread safe.
  */
 class US_EXPORT ModuleContext
 {
 
 public:
 
   ~ModuleContext();
 
   /**
    * Returns the <code>Module</code> object associated with this
    * <code>ModuleContext</code>. This module is called the context module.
    *
    * @return The <code>Module</code> object associated with this
    *         <code>ModuleContext</code>.
    * @throws std::logic_error If this ModuleContext is no
    *         longer valid.
    */
   Module* GetModule() const;
 
   /**
    * Returns the module with the specified identifier.
    *
    * @param id The identifier of the module to retrieve.
    * @return A <code>Module</code> object or <code>0</code> if the
    *         identifier does not match any previously loaded module.
    */
   Module* GetModule(long id) const;
 
 
   /**
    * Returns a list of all known modules.
    * <p>
    * This method returns a list of all modules loaded in the module
    * environment at the time of the call to this method. This list will
    * also contain modules which might already have been unloaded.
    *
    * @param modules A std::vector of <code>Module</code> objects which
    *                will hold one object per known module.
    */
   void GetModules(std::vector<Module*>& modules) const;
 
   /**
    * Registers the specified service object with the specified properties
    * under the specified class names into the framework. A
    * <code>ServiceRegistration</code> object is returned. The
    * <code>ServiceRegistration</code> object is for the private use of the
    * module registering the service and should not be shared with other
    * modules. The registering module is defined to be the context module.
    * Other modules can locate the service by using either the
    * {@link #GetServiceReferences} or {@link #GetServiceReference} method.
    *
    * <p>
    * A module can register a service object that implements the
    * {@link ServiceFactory} interface to have more flexibility in providing
    * service objects to other modules.
    *
    * <p>
    * The following steps are taken when registering a service:
    * <ol>
    * <li>The framework adds the following service properties to the service
    * properties from the specified <code>ServiceProperties</code> (which may be
    * omitted): <br/>
-   * A property named {@link ServiceConstants#SERVICE_ID} identifying the
+   * A property named ServiceConstants#SERVICE_ID() identifying the
    * registration number of the service <br/>
-   * A property named {@link ServiceConstants#OBJECTCLASS} containing all the
+   * A property named ServiceConstants#OBJECTCLASS() containing all the
    * specified classes. <br/>
    * Properties with these names in the specified <code>ServiceProperties</code> will
    * be ignored.
    * <li>The service is added to the framework service registry and may now be
    * used by other modules.
    * <li>A service event of type {@link ServiceEvent#REGISTERED} is fired.
    * <li>A <code>ServiceRegistration</code> object for this registration is
    * returned.
    * </ol>
    *
    * @param clazzes The class names under which the service can be located.
    *        The class names will be stored in the service's
-   *        properties under the key {@link ServiceConstants#OBJECTCLASS}.
+   *        properties under the key ServiceConstants#OBJECTCLASS().
    * @param service The service object or a <code>ServiceFactory</code>
    *        object.
    * @param properties The properties for this service. The keys in the
    *        properties object must all be <code>std::string</code> objects. See
    *        {@link ServiceConstants} for a list of standard service property keys.
    *        Changes should not be made to this object after calling this
    *        method. To update the service's properties the
    *        {@link ServiceRegistration::SetProperties} method must be called.
    *        The set of properties may be omitted if the service has
    *        no properties.
    * @return A <code>ServiceRegistration</code> object for use by the module
    *         registering the service to update the service's properties or to
    *         unregister the service.
    * @throws std::invalid_argument If one of the following is true:
    *         <ul>
    *         <li><code>service</code> is <code>0</code>.
    *         <li><code>properties</code> contains case variants of the same key name.
    *         </ul>
    * @throws std::logic_error If this ModuleContext is no longer valid.
    * @see ServiceRegistration
    * @see ServiceFactory
    */
   ServiceRegistration RegisterService(const std::list<std::string>& clazzes,
                                       US_BASECLASS_NAME* service,
                                       const ServiceProperties& properties = ServiceProperties());
 
   /**
    * Registers the specified service object with the specified properties
    * under the specified class name with the framework.
    *
    * <p>
    * This method is otherwise identical to
-   * RegisterService(const std:vector<std::string>&, itk::LighObject*, const ServiceProperties&)
+   * RegisterService(const std:list&lt;std::string&gt;&, us::Base*, const ServiceProperties&)
    * and is provided as a convenience when <code>service</code> will only be registered under a single
    * class name. Note that even in this case the value of the service's
    * ServiceConstants::OBJECTCLASS property will be a std::list<std::string>, rather
    * than just a single string.
    *
    * @param clazz The class name under which the service can be located.
    * @param service The service object or a ServiceFactory object.
    * @param properties The properties for this service.
    * @return A ServiceRegistration object for use by the module
    *         registering the service to update the service's properties or to
    *         unregister the service.
    * @throws std::logic_error If this ModuleContext is no longer valid.
-   * @see RegisterService(const std:list<std::string>&, itk::LighObject*, const ServiceProperties&)
+   * @see RegisterService(const std:list&lt;std::string&gt;&, us::Base*, const ServiceProperties&)
    */
   ServiceRegistration RegisterService(const char* clazz, US_BASECLASS_NAME* service,
                                       const ServiceProperties& properties = ServiceProperties());
 
   /**
    * Registers the specified service object with the specified properties
    * using the specified template argument with the framework.
    *
    * <p>
    * This method is provided as a convenience when <code>service</code> will only be registered under
    * a single class name whose type is available to the caller. It is otherwise identical to
    * RegisterService(const char*, US_BASECLASS_NAME*, const ServiceProperties&) but should be preferred
    * since it avoids errors in the string literal identifying the class name or interface identifier.
    *
    * @tparam S The type under which the service can be located.
    * @param service The service object or a ServiceFactory object.
    * @param properties The properties for this service.
    * @return A ServiceRegistration object for use by the module
    *         registering the service to update the service's properties or to
    *         unregister the service.
    * @throws std::logic_error If this ModuleContext is no longer valid.
-   * @see RegisterService(const char*, itk::LighObject*, const ServiceProperties&)
+   * @see RegisterService(const char*, us::Base*, const ServiceProperties&)
    */
   template<class S>
   ServiceRegistration RegisterService(US_BASECLASS_NAME* service, const ServiceProperties& properties = ServiceProperties())
   {
     const char* clazz = us_service_interface_iid<S*>();
     if (clazz == 0)
     {
       throw ServiceException(std::string("The interface class you are registering your service ") +
                              us_service_impl_name(service) + " against has no US_DECLARE_SERVICE_INTERFACE macro");
     }
     return RegisterService(clazz, service, properties);
   }
 
   /**
    * Returns a list of <code>ServiceReference</code> objects. The returned
    * list contains services that
    * were registered under the specified class and match the specified filter
    * expression.
    *
    * <p>
    * The list is valid at the time of the call to this method. However since
    * the Micro Services framework is a very dynamic environment, services can be modified or
    * unregistered at any time.
    *
    * <p>
    * The specified <code>filter</code> expression is used to select the
    * registered services whose service properties contain keys and values
-   * which satisfy the filter expression. See {@link LDAPFilter} for a description
+   * which satisfy the filter expression. See LDAPFilter for a description
    * of the filter syntax. If the specified <code>filter</code> is
    * empty, all registered services are considered to match the
    * filter. If the specified <code>filter</code> expression cannot be parsed,
    * an <code>std::invalid_argument</code> will be thrown with a human readable
    * message where the filter became unparsable.
    *
    * <p>
    * The result is a list of <code>ServiceReference</code> objects for all
    * services that meet all of the following conditions:
    * <ul>
    * <li>If the specified class name, <code>clazz</code>, is not
    * empty, the service must have been registered with the
    * specified class name. The complete list of class names with which a
    * service was registered is available from the service's
-   * {@link ServiceConstants::OBJECTCLASS objectClass} property.
+   * {@link ServiceConstants#OBJECTCLASS() objectClass} property.
    * <li>If the specified <code>filter</code> is not empty, the
    * filter expression must match the service.
    * </ul>
    *
    * @param clazz The class name with which the service was registered or
    *        an empty string for all services.
    * @param filter The filter expression or empty for all
    *        services.
    * @return A list of <code>ServiceReference</code> objects or
    *         an empty list if no services are registered which satisfy the
    *         search.
    * @throws std::invalid_argument If the specified <code>filter</code>
    *         contains an invalid filter expression that cannot be parsed.
    * @throws std::logic_error If this ModuleContext is no longer valid.
    */
   std::list<ServiceReference> GetServiceReferences(const std::string& clazz,
                                                    const std::string& filter = std::string());
 
   /**
    * Returns a list of <code>ServiceReference</code> objects. The returned
    * list contains services that
    * were registered under the interface id of the template argument <code>S</code>
    * and match the specified filter expression.
    *
    * <p>
-   * This method is identical to GetServiceReferences(const std::tring&, const std::string&) except that
+   * This method is identical to GetServiceReferences(const std::string&, const std::string&) except that
    * the class name for the service object is automatically deduced from the template argument.
    *
    * @tparam S The type under which the requested service objects must have been registered.
    * @param filter The filter expression or empty for all
    *        services.
    * @return A list of <code>ServiceReference</code> objects or
    *         an empty list if no services are registered which satisfy the
    *         search.
    * @throws std::invalid_argument If the specified <code>filter</code>
    *         contains an invalid filter expression that cannot be parsed.
    * @throws std::logic_error If this ModuleContext is no longer valid.
    * @see GetServiceReferences(const std::string&, const std::string&)
    */
   template<class S>
   std::list<ServiceReference> GetServiceReferences(const std::string& filter = std::string())
   {
     const char* clazz = us_service_interface_iid<S*>();
     if (clazz == 0) throw ServiceException("The service interface class has no US_DECLARE_SERVICE_INTERFACE macro");
     return GetServiceReferences(std::string(clazz), filter);
   }
 
   /**
    * Returns a <code>ServiceReference</code> object for a service that
    * implements and was registered under the specified class.
    *
    * <p>
    * The returned <code>ServiceReference</code> object is valid at the time of
    * the call to this method. However as the Micro Services framework is a very dynamic
    * environment, services can be modified or unregistered at any time.
    *
    * <p>
    * This method is the same as calling
    * {@link ModuleContext::GetServiceReferences(const std::string&, const std::string&)} with an
    * empty filter expression. It is provided as a convenience for
    * when the caller is interested in any service that implements the
    * specified class.
    * <p>
    * If multiple such services exist, the service with the highest ranking (as
-   * specified in its {@link ServiceConstants::SERVICE_RANKING} property) is returned.
+   * specified in its ServiceConstants::SERVICE_RANKING() property) is returned.
    * <p>
    * If there is a tie in ranking, the service with the lowest service ID (as
-   * specified in its {@link ServiceConstants::SERVICE_ID} property); that is, the
+   * specified in its ServiceConstants::SERVICE_ID() property); that is, the
    * service that was registered first is returned.
    *
    * @param clazz The class name with which the service was registered.
    * @return A <code>ServiceReference</code> object, or an invalid <code>ServiceReference</code> if
    *         no services are registered which implement the named class.
    * @throws std::logic_error If this ModuleContext is no longer valid.
    * @throws ServiceException If no service was registered under the given class name.
    * @see #GetServiceReferences(const std::string&, const std::string&)
    */
   ServiceReference GetServiceReference(const std::string& clazz);
 
   /**
    * Returns a <code>ServiceReference</code> object for a service that
    * implements and was registered under the specified template class argument.
    *
    * <p>
    * This method is identical to GetServiceReference(const std::string&) except that
    * the class name for the service object is automatically deduced from the template argument.
    *
    * @tparam S The type under which the requested service must have been registered.
    * @return A <code>ServiceReference</code> object, or an invalid <code>ServiceReference</code> if
    *         no services are registered which implement the type <code>S</code>.
    * @throws std::logic_error If this ModuleContext is no longer valid.
    * @throws ServiceException It no service was registered under the given class name.
    * @see #GetServiceReference(const std::string&)
    * @see #GetServiceReferences(const std::string&)
    */
   template<class S>
   ServiceReference GetServiceReference()
   {
     const char* clazz = us_service_interface_iid<S*>();
     if (clazz == 0) throw ServiceException("The service interface class has no US_DECLARE_SERVICE_INTERFACE macro");
     return GetServiceReference(std::string(clazz));
   }
 
   /**
    * Returns the service object referenced by the specified
    * <code>ServiceReference</code> object.
    * <p>
    * A module's use of a service is tracked by the module's use count of that
    * service. Each time a service's service object is returned by
    * {@link #GetService(const ServiceReference&)} the context module's use count for
    * that service is incremented by one. Each time the service is released by
    * {@link #UngetService(const ServiceReference&)} the context module's use count
    * for that service is decremented by one.
    * <p>
    * When a module's use count for a service drops to zero, the module should
    * no longer use that service.
    *
    * <p>
    * This method will always return <code>0</code> when the service
    * associated with this <code>reference</code> has been unregistered.
    *
    * <p>
    * The following steps are taken to get the service object:
    * <ol>
    * <li>If the service has been unregistered, <code>0</code> is returned.
    * <li>The context module's use count for this service is incremented by
    * one.
    * <li>If the context module's use count for the service is currently one
    * and the service was registered with an object implementing the
    * <code>ServiceFactory</code> interface, the
    * {@link ServiceFactory::GetService} method is
    * called to create a service object for the context module. This service
    * object is cached by the framework. While the context module's use count
    * for the service is greater than zero, subsequent calls to get the
    * services's service object for the context module will return the cached
    * service object. <br>
    * If the <code>ServiceFactory</code> object throws an
    * exception, <code>0</code> is returned and a warning is logged.
    * <li>The service object for the service is returned.
    * </ol>
    *
    * @param reference A reference to the service.
    * @return A service object for the service associated with
    *         <code>reference</code> or <code>0</code> if the service is not
    *         registered or the <code>ServiceFactory</code> threw
    *         an exception.
    * @throws std::logic_error If this ModuleContext is no
    *         longer valid.
    * @throws std::invalid_argument If the specified
    *         <code>ServiceReference</code> is invalid (default constructed).
    * @see #UngetService(const ServiceReference&)
    * @see ServiceFactory
    */
   US_BASECLASS_NAME* GetService(const ServiceReference& reference);
 
   /**
    * Returns the service object referenced by the specified
    * <code>ServiceReference</code> object.
    * <p>
    * This is a convenience method which is identical to US_BASECLASS_NAME* GetService(const ServiceReference&)
    * except that it casts the service object to the supplied template argument type
    *
    * @tparam S The type the service object will be cast to.
    * @return A service object for the service associated with
    *         <code>reference</code> or <code>0</code> if the service is not
    *         registered, the <code>ServiceFactory</code> threw
    *         an exception or the service could not be casted to the desired type.
    * @throws std::logic_error If this ModuleContext is no
    *         longer valid.
    * @throws std::invalid_argument If the specified
    *         <code>ServiceReference</code> is invalid (default constructed).
    * @see #GetService(const ServiceReference&)
    * @see #UngetService(const ServiceReference&)
    * @see ServiceFactory
    */
   template<class S>
   S* GetService(const ServiceReference& reference)
   {
     return dynamic_cast<S*>(GetService(reference));
   }
 
   /**
    * Releases the service object referenced by the specified
    * <code>ServiceReference</code> object. If the context module's use count
    * for the service is zero, this method returns <code>false</code>.
    * Otherwise, the context modules's use count for the service is decremented
    * by one.
    *
    * <p>
    * The service's service object should no longer be used and all references
    * to it should be destroyed when a module's use count for the service drops
    * to zero.
    *
    * <p>
    * The following steps are taken to unget the service object:
    * <ol>
    * <li>If the context module's use count for the service is zero or the
    * service has been unregistered, <code>false</code> is returned.
    * <li>The context module's use count for this service is decremented by
    * one.
    * <li>If the context module's use count for the service is currently zero
    * and the service was registered with a <code>ServiceFactory</code> object,
    * the ServiceFactory#UngetService
    * method is called to release the service object for the context module.
    * <li><code>true</code> is returned.
    * </ol>
    *
    * @param reference A reference to the service to be released.
    * @return <code>false</code> if the context module's use count for the
    *         service is zero or if the service has been unregistered;
    *         <code>true</code> otherwise.
    * @throws std::logic_error If this ModuleContext is no
    *         longer valid.
    * @see #GetService
    * @see ServiceFactory
    */
   bool UngetService(const ServiceReference& reference);
 
   void AddServiceListener(const ServiceListener& delegate,
                           const std::string& filter = std::string());
   void RemoveServiceListener(const ServiceListener& delegate);
 
   void AddModuleListener(const ModuleListener& delegate);
   void RemoveModuleListener(const ModuleListener& delegate);
 
   /**
    * Adds the specified <code>callback</code> with the
    * specified <code>filter</code> to the context modules's list of listeners.
    * See LDAPFilter for a description of the filter syntax. Listeners
    * are notified when a service has a lifecycle state change.
    *
    * <p>
    * You must take care to remove registered listeners befor the <code>receiver</code>
    * object is destroyed. However, the Micro Services framework takes care
    * of removing all listeners registered by this context module's classes
    * after the module is unloaded.
    *
    * <p>
    * If the context module's list of listeners already contains a pair <code>(r,c)</code>
    * of <code>receiver</code> and <code>callback</code> such that
    * <code>(r == receiver && c == callback)</code>, then this
    * method replaces that callback's filter (which may be empty)
    * with the specified one (which may be empty).
    *
    * <p>
    * The callback is called if the filter criteria is met. To filter based
    * upon the class of the service, the filter should reference the
-   * {@link ServiceConstants#OBJECTCLASS} property. If <code>filter</code> is
+   * ServiceConstants#OBJECTCLASS() property. If <code>filter</code> is
    * empty, all services are considered to match the filter.
    *
    * <p>
    * When using a <code>filter</code>, it is possible that the
    * <code>ServiceEvent</code>s for the complete lifecycle of a service
    * will not be delivered to the callback. For example, if the
    * <code>filter</code> only matches when the property <code>x</code> has
    * the value <code>1</code>, the callback will not be called if the
    * service is registered with the property <code>x</code> not set to the
    * value <code>1</code>. Subsequently, when the service is modified
    * setting property <code>x</code> to the value <code>1</code>, the
    * filter will match and the callback will be called with a
    * <code>ServiceEvent</code> of type <code>MODIFIED</code>. Thus, the
    * callback will not be called with a <code>ServiceEvent</code> of type
    * <code>REGISTERED</code>.
    *
    * @tparam The type of the receiver (containing the member function to be called)
    * @param receiver The object to connect to.
    * @param callback The member function pointer to call.
    * @param filter The filter criteria.
    * @throws std::invalid_argument If <code>filter</code> contains an
    *         invalid filter string that cannot be parsed.
    * @throws std::logic_error If this ModuleContext is no
    *         longer valid.
    * @see ServiceEvent
    * @see RemoveServiceListener()
    */
   template<class R>
   void AddServiceListener(R* receiver, void(R::*callback)(const ServiceEvent),
                           const std::string& filter = std::string())
   {
     AddServiceListener(ServiceListenerMemberFunctor(receiver, callback), filter);
   }
 
   /**
    * Removes the specified <code>callback</code> from the context module's
    * list of listeners.
    *
    * <p>
    * If the <code>(receiver,callback)</code> pair is not contained in this
    * context module's list of listeners, this method does nothing.
    *
    * @tparam The type of the receiver (containing the member function to be removed)
    * @param receiver The object from which to disconnect.
    * @param callback The member function pointer to remove.
    * @throws std::logic_error If this ModuleContext is no
    *         longer valid.
    * @see AddServiceListener()
    */
   template<class R>
   void RemoveServiceListener(R* receiver, void(R::*callback)(const ServiceEvent))
   {
     RemoveServiceListener(ServiceListenerMemberFunctor(receiver, callback));
   }
 
   /**
    * Adds the specified <code>callback</code> to the context modules's list
    * of listeners. Listeners are notified when a module has a lifecycle
    * state change.
    *
    * <p>
    * If the context module's list of listeners already contains a pair <code>(r,c)</code>
    * of <code>receiver</code> and <code>callback</code> such that
    * <code>(r == receiver && c == callback)</code>, then this method does nothing.
    *
    * @tparam The type of the receiver (containing the member function to be called)
    * @param receiver The object to connect to.
    * @param callback The member function pointer to call.
    * @throws std::logic_error If this ModuleContext is no
    *         longer valid.
    * @see ModuleEvent
    */
   template<class R>
   void AddModuleListener(R* receiver, void(R::*callback)(const ModuleEvent))
   {
     AddModuleListener(ModuleListenerMemberFunctor(receiver, callback));
   }
 
   /**
    * Removes the specified <code>callback</code> from the context module's
    * list of listeners.
    *
    * <p>
    * If the <code>(receiver,callback)</code> pair is not contained in this
    * context module's list of listeners, this method does nothing.
    *
    * @tparam The type of the receiver (containing the member function to be removed)
    * @param receiver The object from which to disconnect.
    * @param callback The member function pointer to remove.
    * @throws std::logic_error If this ModuleContext is no
    *         longer valid.
    * @see AddModuleListener()
    */
   template<class R>
   void RemoveModuleListener(R* receiver, void(R::*callback)(const ModuleEvent))
   {
     RemoveModuleListener(ModuleListenerMemberFunctor(receiver, callback));
   }
 
 
 private:
 
   friend class Module;
   friend class ModulePrivate;
 
   ModuleContext(ModulePrivate* module);
 
   // purposely not implemented
   ModuleContext(const ModuleContext&);
   ModuleContext& operator=(const ModuleContext&);
 
   ModuleContextPrivate * const d;
 };
 
 US_END_NAMESPACE
 
 #endif /* USMODULECONTEXT_H_ */
diff --git a/Core/Code/CppMicroServices/src/module/usModuleEvent.h b/Core/Code/CppMicroServices/src/module/usModuleEvent.h
index 0369735e6b..0e1f076758 100644
--- a/Core/Code/CppMicroServices/src/module/usModuleEvent.h
+++ b/Core/Code/CppMicroServices/src/module/usModuleEvent.h
@@ -1,162 +1,162 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 #ifndef USMODULEEVENT_H
 #define USMODULEEVENT_H
 
 #include <iostream>
 
 #include "usSharedData.h"
 
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4251)
 #endif
 
 US_BEGIN_NAMESPACE
 
 class Module;
 class ModuleEventData;
 
 /**
  * \ingroup MicroServices
  *
  * An event from the Micro Services framework describing a module lifecycle change.
  * <p>
  * <code>ModuleEvent</code> objects are delivered to listeners connected
  * via ModuleContext::AddModuleListener() when a change
  * occurs in a modules's lifecycle. A type code is used to identify
  * the event type for future extendability.
  *
- * @see ModuleContext#connectModuleListener
+ * @see ModuleContext#AddModuleListener
  */
 class US_EXPORT ModuleEvent
 {
 
   SharedDataPointer<ModuleEventData> d;
 
 public:
 
   enum Type {
 
     /**
      * The module has been loaded.
      * <p>
      * The module's
      * \link ModuleActivator::Load(ModuleContext*) ModuleActivator Load\endlink method
      * has been executed.
      */
     LOADED,
 
     /**
      * The module has been unloaded.
      * <p>
      * The module's
      * \link ModuleActivator::Unload(ModuleContext*) ModuleActivator Unload\endlink method
      * has been executed.
      */
     UNLOADED,
 
     /**
      * The module is about to be loaded.
      * <p>
      * The module's
      * \link ModuleActivator::Load(ModuleContext*) ModuleActivator Load\endlink method
      * is about to be called.
      */
     LOADING,
 
     /**
      * The module is about to be unloaded.
      * <p>
      * The module's
      * \link ModuleActivator::Unload(ModuleContext*) ModuleActivator Unload\endlink method
      * is about to be called.
      */
     UNLOADING
 
   };
 
   /**
    * Creates an invalid instance.
    */
   ModuleEvent();
 
   ~ModuleEvent();
 
   /**
    * Can be used to check if this ModuleEvent instance is valid,
    * or if it has been constructed using the default constructor.
    *
    * @return <code>true</code> if this event object is valid,
    *         <code>false</code> otherwise.
    */
   bool IsNull() const;
 
   /**
    * Creates a module event of the specified type.
    *
    * @param type The event type.
    * @param module The module which had a lifecycle change.
    */
   ModuleEvent(Type type, Module* module);
 
   ModuleEvent(const ModuleEvent& other);
 
   ModuleEvent& operator=(const ModuleEvent& other);
 
   /**
    * Returns the module which had a lifecycle change.
    *
    * @return The module that had a change occur in its lifecycle.
    */
   Module* GetModule() const;
 
   /**
    * Returns the type of lifecyle event. The type values are:
    * <ul>
    * <li>{@link #LOADING}
    * <li>{@link #LOADED}
    * <li>{@link #UNLOADING}
    * <li>{@link #UNLOADED}
    * </ul>
    *
    * @return The type of lifecycle event.
    */
   Type GetType() const;
 
 };
 
 US_END_NAMESPACE
 
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
 /**
  * \ingroup MicroServices
  * @{
  */
 US_EXPORT std::ostream& operator<<(std::ostream& os, US_PREPEND_NAMESPACE(ModuleEvent::Type) eventType);
 US_EXPORT std::ostream& operator<<(std::ostream& os, const US_PREPEND_NAMESPACE(ModuleEvent)& event);
 /** @}*/
 
 #endif // USMODULEEVENT_H
diff --git a/Core/Code/CppMicroServices/src/module/usModuleInfo.h b/Core/Code/CppMicroServices/src/module/usModuleInfo.h
index b277c33dae..9a117c0c2f 100644
--- a/Core/Code/CppMicroServices/src/module/usModuleInfo.h
+++ b/Core/Code/CppMicroServices/src/module/usModuleInfo.h
@@ -1,59 +1,68 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #ifndef USMODULEINFO_H
 #define USMODULEINFO_H
 
-#include <usExportMacros.h>
+#include <usConfig.h>
 
 #include <string>
 
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable: 4251)
+#endif
+
 US_BEGIN_NAMESPACE
 
 struct ModuleActivator;
 
 /**
  * This class is not intended to be used directly. It is exported to support
  * the US module system.
  */
 struct US_EXPORT ModuleInfo
 {
   ModuleInfo(const std::string& name, const std::string& libName, const std::string& moduleDeps,
              const std::string& version);
 
   typedef ModuleActivator*(*ModuleActivatorHook)(void);
 
   std::string name;
   std::string libName;
   std::string moduleDeps;
   std::string version;
 
   std::string location;
 
   long id;
 
   ModuleActivatorHook activatorHook;
 };
 
 US_END_NAMESPACE
 
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
 #endif // USMODULEINFO_H
diff --git a/Core/Code/CppMicroServices/src/module/usModuleInitialization.h b/Core/Code/CppMicroServices/src/module/usModuleInitialization.h
new file mode 100644
index 0000000000..be931c1a63
--- /dev/null
+++ b/Core/Code/CppMicroServices/src/module/usModuleInitialization.h
@@ -0,0 +1,123 @@
+/*=============================================================================
+
+  Library: CppMicroServices
+
+  Copyright (c) German Cancer Research Center,
+    Division of Medical and Biological Informatics
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+=============================================================================*/
+
+#include <usStaticInit_p.h>
+
+#include <usModuleRegistry.h>
+#include <usModuleInfo.h>
+#include <usModuleContext.h>
+#include <usModule.h>
+#include <usModuleUtils_p.h>
+
+#ifndef USMODULEINITIALIZATION_H
+#define USMODULEINITIALIZATION_H
+
+/**
+ * \ingroup MicroServices
+ *
+ * \def US_INITIALIZE_MODULE(_module_name, _module_libname, _module_depends, _module_version)
+ * \brief Creates initialization code for a module.
+ *
+ * Each module which wants to register itself with the CppMicroServices library
+ * has to put a call to this macro in one of its source files.
+ *
+ * Example call for a module with file-name "libmylibname.so".
+ * \code
+ * US_INITIALIZE_MODULE("My Service Implementation", "mylibname", "", "1.0.0")
+ * \endcode
+ *
+ * \remarks If you are using CMake, consider using the provided CMake macro
+ * <code>usFunctionGenerateModuleInit()</code>.
+ *
+ * \param _module_name A human-readable name for the module.
+ *        If you use this macro in a source file for an executable, the module name must
+ *        be a valid C-identifier (no spaces etc.).
+ * \param _module_libname The physical name of the module, withou prefix or suffix.
+ * \param _module_depends A list of module dependencies. This is meta-data only.
+ * \param _module_version A version string in the form of "<major>.<minor>.<micro>.<qualifier>".
+ */
+#define US_INITIALIZE_MODULE(_module_name, _module_libname, _module_depends, _module_version) \
+US_BEGIN_NAMESPACE \
+\
+/* Declare a file scoped ModuleInfo object */ \
+US_GLOBAL_STATIC_WITH_ARGS(ModuleInfo, moduleInfo, (_module_name, _module_libname, _module_depends, _module_version)) \
+\
+/* This class is used to statically initialize the library within the C++ Micro services \
+   library. looks up a library specific C-style function a */ \
+class US_ABI_LOCAL ModuleInitializer { \
+\
+public: \
+\
+  ModuleInitializer() \
+  { \
+    std::string location = ModuleUtils::GetLibraryPath(moduleInfo()->libName, \
+                                                       reinterpret_cast<void*>(moduleInfo)); \
+    std::string activator_func = "_us_module_activator_instance_"; \
+    if(moduleInfo()->libName.empty()) \
+    { \
+      activator_func.append(moduleInfo()->name); \
+    } \
+    else \
+    { \
+      activator_func.append(moduleInfo()->libName); \
+    } \
+\
+    moduleInfo()->location = location;\
+\
+    if (moduleInfo()->libName.empty()) \
+    { \
+      /* make sure we retrieve symbols from the executable, if "libName" is empty */ \
+      location.clear(); \
+    } \
+    moduleInfo()->activatorHook = reinterpret_cast<ModuleInfo::ModuleActivatorHook>(ModuleUtils::GetSymbol(location, activator_func.c_str())); \
+\
+    Register(); \
+  } \
+\
+  static void Register() \
+  { \
+    ModuleRegistry::Register(moduleInfo()); \
+  } \
+\
+  ~ModuleInitializer() \
+  { \
+    ModuleRegistry::UnRegister(moduleInfo()); \
+  } \
+\
+}; \
+\
+US_ABI_LOCAL ModuleContext* GetModuleContext() \
+{ \
+  /* make sure the module is registered */ \
+  if (moduleInfo()->id == 0) \
+  { \
+    ModuleInitializer::Register(); \
+  } \
+\
+  return ModuleRegistry::GetModule(moduleInfo()->id)->GetModuleContext(); \
+} \
+\
+US_END_NAMESPACE \
+\
+static US_PREPEND_NAMESPACE(ModuleInitializer) _InitializeModule; \
+
+
+#endif // USMODULEINITIALIZATION_H
diff --git a/Core/Code/CppMicroServices/src/module/usModulePrivate.h b/Core/Code/CppMicroServices/src/module/usModulePrivate.h
index b33d3d2157..250569eebd 100644
--- a/Core/Code/CppMicroServices/src/module/usModulePrivate.h
+++ b/Core/Code/CppMicroServices/src/module/usModulePrivate.h
@@ -1,91 +1,91 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 #ifndef USMODULEPRIVATE_H
 #define USMODULEPRIVATE_H
 
 #include <map>
 
 #include "usModuleRegistry.h"
 #include "usModuleVersion.h"
 #include "usModuleInfo.h"
 
-#include "usAtomicInt.h"
+#include "usAtomicInt_p.h"
 
 US_BEGIN_NAMESPACE
 
 class CoreModuleContext;
 class ModuleContext;
 struct ModuleActivator;
 
 /**
  * \ingroup MicroServices
  */
 class ModulePrivate {
 
 public:
 
   /**
    * Construct a new module based on a ModuleInfo object.
    */
   ModulePrivate(Module* qq, CoreModuleContext* coreCtx, ModuleInfo* info);
 
   virtual ~ModulePrivate();
 
   void RemoveModuleResources();
 
   CoreModuleContext* const coreCtx;
 
   std::vector<long> requiresIds;
 
   std::vector<std::string> requiresLibs;
 
   /**
    * Module version
    */
   ModuleVersion version;
 
   ModuleInfo info;
 
   /**
    * ModuleContext for the module
    */
   ModuleContext* moduleContext;
 
   ModuleActivator* moduleActivator;
 
   std::map<std::string, std::string> properties;
 
   Module* const q;
 
 private:
 
   static AtomicInt idCounter;
 
   // purposely not implemented
   ModulePrivate(const ModulePrivate&);
   ModulePrivate& operator=(const ModulePrivate&);
 
 };
 
 US_END_NAMESPACE
 
 #endif // USMODULEPRIVATE_H
diff --git a/Core/Code/CppMicroServices/src/module/usModuleRegistry.cpp b/Core/Code/CppMicroServices/src/module/usModuleRegistry.cpp
index 4180978d12..fe432c9106 100644
--- a/Core/Code/CppMicroServices/src/module/usModuleRegistry.cpp
+++ b/Core/Code/CppMicroServices/src/module/usModuleRegistry.cpp
@@ -1,255 +1,255 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 #include <usConfig.h>
 
 #include "usModuleRegistry.h"
 
 #include "usModule.h"
 #include "usModuleInfo.h"
 #include "usModuleContext.h"
 #include "usModuleActivator.h"
 #include "usCoreModuleContext_p.h"
-#include "usStaticInit.h"
+#include "usStaticInit_p.h"
 
 #include <cassert>
 
 
 US_BEGIN_NAMESPACE
 
 typedef US_UNORDERED_MAP_TYPE<long, Module*> ModuleMap;
 
 US_GLOBAL_STATIC(CoreModuleContext, coreModuleContext)
 
 template<typename T>
 struct ModuleDeleter
 {
   void operator()(GlobalStatic<T>& globalStatic) const
   {
     ModuleMap* moduleMap = globalStatic.pointer;
     for (ModuleMap::const_iterator i = moduleMap->begin();
          i != moduleMap->end(); ++i)
     {
       delete i->second;
     }
     DefaultGlobalStaticDeleter<T> defaultDeleter;
     defaultDeleter(globalStatic);
   }
 };
 
 /**
  * Table of all installed modules in this framework.
  * Key is the module id.
  */
 US_GLOBAL_STATIC_WITH_DELETER(ModuleMap, modules, ModuleDeleter)
 
 typedef Mutex MutexType;
 typedef MutexLock<MutexType> MutexLocker;
 
 /**
  * Lock for protecting the modules object
  */
 US_GLOBAL_STATIC(MutexType, modulesLock)
 
 /**
  * Lock for protecting the register count
  */
 US_GLOBAL_STATIC(MutexType, countLock)
 
 
 void ModuleRegistry::Register(ModuleInfo* info)
 {
   static long regCount = 0;
   if (info->id > 0)
   {
     // The module was already registered
     Module* module = 0;
     {
       MutexLocker lock(*modulesLock());
       module = modules()->operator[](info->id);
       assert(module != 0);
     }
     module->Start();
   }
   else
   {
     Module* module = 0;
     // check if the module is reloaded
     {
       MutexLocker lock(*modulesLock());
       ModuleMap* map = modules();
       for (ModuleMap::const_iterator i = map->begin();
            i != map->end(); ++i)
       {
         if (i->second->GetLocation() == info->location)
         {
           module = i->second;
           info->id = module->GetModuleId();
         }
       }
     }
 
     if (!module)
     {
       module = new Module();
       countLock()->Lock();
       info->id = ++regCount;
       countLock()->Unlock();
 
       module->Init(coreModuleContext(), info);
 
       MutexLocker lock(*modulesLock());
       ModuleMap* map = modules();
       map->insert(std::make_pair(info->id, module));
     }
     else
     {
       module->Init(coreModuleContext(), info);
     }
 
     module->Start();
   }
 }
 
 void ModuleRegistry::UnRegister(const ModuleInfo* info)
 {
   // If we are unregistering the core module, we just call
   // the module activators Unload() method (if there is a
   // module activator). Since we cannot be sure that the
   // ModuleContext for the core library is still valid, we
   // just pass a null-pointer. Using the module context during
   // static deinitalization time of the core library makes
   // no sense anyway.
   if (info->id == 1 && info->activatorHook)
   {
     info->activatorHook()->Unload(0);
     return;
   }
 
   Module* curr = 0;
   {
     MutexLocker lock(*modulesLock());
     curr = modules()->operator[](info->id);
     assert(curr != 0);
   }
   curr->Stop();
   curr->Uninit();
 }
 
 Module* ModuleRegistry::GetModule(long id)
 {
   MutexLocker lock(*modulesLock());
 
   ModuleMap::const_iterator iter = modules()->find(id);
   if (iter != modules()->end())
   {
     return iter->second;
   }
   return 0;
 }
 
 Module* ModuleRegistry::GetModule(const std::string& name)
 {
   MutexLocker lock(*modulesLock());
 
   ModuleMap::const_iterator iter = modules()->begin();
   ModuleMap::const_iterator iterEnd = modules()->end();
   for (; iter != iterEnd; ++iter)
   {
     if (iter->second->GetName() == name)
     {
       return iter->second;
     }
   }
 
   return 0;
 }
 
 void ModuleRegistry::GetModules(std::vector<Module*>& m)
 {
   MutexLocker lock(*modulesLock());
 
   ModuleMap* map = modules();
   ModuleMap::const_iterator iter = map->begin();
   ModuleMap::const_iterator iterEnd = map->end();
   for (; iter != iterEnd; ++iter)
   {
     m.push_back(iter->second);
   }
 }
 
 void ModuleRegistry::GetLoadedModules(std::vector<Module*>& m)
 {
   MutexLocker lock(*modulesLock());
 
   ModuleMap::const_iterator iter = modules()->begin();
   ModuleMap::const_iterator iterEnd = modules()->end();
   for (; iter != iterEnd; ++iter)
   {
     if (iter->second->IsLoaded())
     {
       m.push_back(iter->second);
     }
   }
 }
 
 
 typedef std::list<ModuleActivatorInstanceFunction> StaticInstanceFunctionList;
 
 template<typename T>
 struct StaticModuleDeleter
 {
   void operator()(GlobalStatic<T>& globalStatic) const
   {
     StaticInstanceFunctionList* funcList = globalStatic.pointer;
     for (StaticInstanceFunctionList::const_reverse_iterator i = funcList->rbegin();
          i != funcList->rend(); ++i)
     {
       (*i)()->Unload(ModuleRegistry::GetModule(1)->GetModuleContext());
     }
     DefaultGlobalStaticDeleter<T> defaultDeleter;
     defaultDeleter(globalStatic);
   }
 };
 
 /**
  * List of all static modules in this framework.
  */
 US_GLOBAL_STATIC_WITH_DELETER(StaticInstanceFunctionList, staticInstanceFunctionList, StaticModuleDeleter)
 
 /**
  * Lock for protecting the modules object
  */
 US_GLOBAL_STATIC(MutexType, staticInstanceFunctionListLock)
 
 void RegisterStaticModuleActivatorInstanceFunction(ModuleActivatorInstanceFunction func)
 {
   MutexLocker lock(*staticInstanceFunctionListLock());
   staticInstanceFunctionList()->push_back(func);
 }
 
 void UnregisterStaticModuleActivatorInstanceFunction(ModuleActivatorInstanceFunction func)
 {
   MutexLocker lock(*staticInstanceFunctionListLock());
   staticInstanceFunctionList()->remove(func);
 }
 
 US_END_NAMESPACE
diff --git a/Core/Code/CppMicroServices/src/module/usModuleRegistry.h b/Core/Code/CppMicroServices/src/module/usModuleRegistry.h
index 826aed5fc5..8813a39fa5 100644
--- a/Core/Code/CppMicroServices/src/module/usModuleRegistry.h
+++ b/Core/Code/CppMicroServices/src/module/usModuleRegistry.h
@@ -1,121 +1,121 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 #ifndef USMODULEREGISTRY_H
 #define USMODULEREGISTRY_H
 
 #include <vector>
 #include <string>
 
-#include <usExportMacros.h>
+#include <usConfig.h>
 
 US_BEGIN_NAMESPACE
 
 class Module;
 struct ModuleInfo;
 struct ModuleActivator;
 
 /**
  * \ingroup MicroServices
  *
  * Here we handle all the modules that are loaded in the framework.
  */
 class US_EXPORT ModuleRegistry {
 
 public:
 
   /**
    * Get the module that has the specified module identifier.
    *
    * @param id The identifier of the module to get.
    * @return Module or null
    *         if the module was not found.
    */
   static Module* GetModule(long id);
 
   /**
    * Get the module that has specified module name.
    *
    * @param name The name of the module to get.
    * @return Module or null.
    */
   static Module* GetModule(const std::string& name);
 
   /**
    * Get all known modules.
    *
    * @return A Module list with modules.
    */
   static void GetModules(std::vector<Module*>& modules);
 
   /**
    * Get all modules currently in module state LOADED.
    *
    * @return A List of Modules.
    */
   static void GetLoadedModules(std::vector<Module*>& modules);
 
 private:
 
   friend class ModuleInitializer;
 
   // disabled
   ModuleRegistry();
 
   static void Register(ModuleInfo* info);
 
   static void UnRegister(const ModuleInfo* info);
 
 };
 
 typedef ModuleActivator* (*ModuleActivatorInstanceFunction)();
 
 void US_EXPORT RegisterStaticModuleActivatorInstanceFunction(ModuleActivatorInstanceFunction func);
 void US_EXPORT UnregisterStaticModuleActivatorInstanceFunction(ModuleActivatorInstanceFunction func);
 
 US_END_NAMESPACE
 
 #define US_MODULE_LOAD(moduleName, context) \
   _us_module_activator_instance_ ## moduleName ()->Load(context);
 
 #define US_MODULE_UNLOAD(moduleName, context) \
   _us_module_activator_instance_ ## moduleName ()->Unload(context);
 
 #define US_MODULE_IMPORT(moduleName)                                                             \
   extern ::US_PREPEND_NAMESPACE(ModuleActivator)* _us_module_activator_instance_##moduleName();  \
   class Static##moduleName##ModuleInstance                                                       \
   {                                                                                              \
   public:                                                                                        \
     Static##moduleName##ModuleInstance()                                                         \
     {                                                                                            \
       RegisterStaticModuleActivatorInstanceFunction(_us_module_activator_instance_##moduleName); \
       _us_module_activator_instance_##moduleName()->Load(::US_PREPEND_NAMESPACE(GetModuleContext)()); \
     }                                                                                            \
     ~Static##moduleName##ModuleInstance()                                                        \
     {                                                                                            \
       UnregisterStaticModuleActivatorInstanceFunction(_us_module_activator_instance_##moduleName); \
       _us_module_activator_instance_##moduleName()->Unload(::US_PREPEND_NAMESPACE(GetModuleContext)()); \
     }                                                                                            \
   };                                                                                             \
   static Static##moduleName##ModuleInstance static##moduleName##Instance;
 
 
 #endif // USMODULEREGISTRY_H
diff --git a/Core/Code/CppMicroServices/src/module/usModuleUtils.cpp b/Core/Code/CppMicroServices/src/module/usModuleUtils.cpp
index 807519389f..cc5ff30c76 100644
--- a/Core/Code/CppMicroServices/src/module/usModuleUtils.cpp
+++ b/Core/Code/CppMicroServices/src/module/usModuleUtils.cpp
@@ -1,155 +1,166 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
-#include "usModuleUtils.h"
-#include <usUtils.h>
+#include "usModuleUtils_p.h"
+#include <usUtils_p.h>
 
 US_BEGIN_NAMESPACE
 
 #ifdef __GNUC__
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
 
 #include <dlfcn.h>
 
 std::string GetLibraryPath_impl(const std::string& /*libName*/, void* symbol)
 {
   Dl_info info;
   if (dladdr(symbol, &info))
   {
     return info.dli_fname;
   }
   else
   {
-    US_DEBUG << GetLastErrorStr();
+    US_DEBUG << "GetLibraryPath_impl() dladdr() failed: " << dlerror();
   }
   return "";
 }
 
 void* GetSymbol_impl(const std::string& libName, const char* symbol)
 {
+  // Clear the last error message
+  dlerror();
+
   void* selfHandle = 0;
   if (libName.empty())
   {
     // Get the handle of the executable
     selfHandle = dlopen(0, RTLD_LAZY);
   }
   else
   {
     selfHandle = dlopen(libName.c_str(), RTLD_LAZY);
   }
 
   if (selfHandle)
   {
     void* addr = dlsym(selfHandle, symbol);
+    if (!addr)
+    {
+      const char* dlerrorMsg = dlerror();
+      if (dlerrorMsg)
+      {
+        US_DEBUG << "GetSymbol_impl() failed: " << dlerrorMsg;
+      }
+    }
     dlclose(selfHandle);
     return addr;
   }
   else
   {
-    US_DEBUG << GetLastErrorStr();
+    US_DEBUG << "GetSymbol_impl() dlopen() failed: " << dlerror();
   }
   return 0;
 }
 
 #elif _WIN32
 
 #include <windows.h>
 
 std::string GetLibraryPath_impl(const std::string& libName, void *symbol)
 {
   HMODULE handle = 0;
   if (libName.empty())
   {
     // get the handle for the executable
     handle = GetModuleHandle(0);
   }
   else
   {
     handle = GetModuleHandle(libName.c_str());
   }
   if (!handle)
   {
     US_DEBUG << "GetLibraryPath_impl():GetModuleHandle() " << GetLastErrorStr();
     return "";
   }
 
   char modulePath[512];
   if (GetModuleFileName(handle, modulePath, 512))
   {
     return modulePath;
   }
 
   US_DEBUG << "GetLibraryPath_impl():GetModuleFileName() " << GetLastErrorStr();
   return "";
 }
 
 void* GetSymbol_impl(const std::string& libName, const char* symbol)
 {
   HMODULE handle = NULL;
   if (libName.empty())
   {
     handle = GetModuleHandle(NULL);
   }
   else
   {
     handle = GetModuleHandle(libName.c_str());
   }
 
   if (!handle)
   {
     US_DEBUG << "GetSymbol_impl():GetModuleHandle() " << GetLastErrorStr();
     return 0;
   }
 
   void* addr = (void*)GetProcAddress(handle, symbol);
   if (!addr)
   {
     US_DEBUG << "GetSymbol_impl():GetProcAddress(handle," << symbol << ") " << GetLastErrorStr();
   }
   return addr;
 }
 #else
 std::string GetLibraryPath_impl(const std::string& libName, void* symbol)
 {
   return "";
 }
 
 void* GetSymbol_impl(const std::string& libName, const char* symbol)
 {
   return 0;
 }
 #endif
 
 std::string ModuleUtils::GetLibraryPath(const std::string& libName, void* symbol)
 {
   return GetLibraryPath_impl(libName, symbol);
 }
 
 void* ModuleUtils::GetSymbol(const std::string& libName, const char* symbol)
 {
   return GetSymbol_impl(libName, symbol);
 }
 
 US_END_NAMESPACE
diff --git a/Core/Code/CppMicroServices/src/module/usModuleUtils.h b/Core/Code/CppMicroServices/src/module/usModuleUtils_p.h
similarity index 97%
rename from Core/Code/CppMicroServices/src/module/usModuleUtils.h
rename to Core/Code/CppMicroServices/src/module/usModuleUtils_p.h
index a38ba51da6..ec32d6a1ce 100644
--- a/Core/Code/CppMicroServices/src/module/usModuleUtils.h
+++ b/Core/Code/CppMicroServices/src/module/usModuleUtils_p.h
@@ -1,45 +1,45 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #ifndef USMODULEUTILS_H
 #define USMODULEUTILS_H
 
-#include <usExportMacros.h>
+#include <usConfig.h>
 
 #include <string>
 
 US_BEGIN_NAMESPACE
 
 /**
  * This class is not intended to be used directly. It is exported to support
  * the US module system.
  */
 struct US_EXPORT ModuleUtils
 {
   static std::string GetLibraryPath(const std::string& libName, void* symbol);
 
   static void* GetSymbol(const std::string& libName, const char* symbol);
 };
 
 US_END_NAMESPACE
 
 #endif // USMODULEUTILS_H
diff --git a/Core/Code/CppMicroServices/src/module/usModuleVersion.h b/Core/Code/CppMicroServices/src/module/usModuleVersion.h
index a92c079951..cd3091d519 100644
--- a/Core/Code/CppMicroServices/src/module/usModuleVersion.h
+++ b/Core/Code/CppMicroServices/src/module/usModuleVersion.h
@@ -1,254 +1,263 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 #ifndef USMODULEVERSION_H
 #define USMODULEVERSION_H
 
-#include <usExportMacros.h>
+#include <usConfig.h>
 
 #include <string>
 
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable: 4251)
+#endif
+
 US_BEGIN_NAMESPACE
 
 /**
  * \ingroup MicroServices
  *
  * Version identifier for US modules.
  *
  * <p>
  * Version identifiers have four components.
  * <ol>
  * <li>Major version. A non-negative integer.</li>
  * <li>Minor version. A non-negative integer.</li>
  * <li>Micro version. A non-negative integer.</li>
  * <li>Qualifier. A text string. See <code>ModuleVersion(const std::string&)</code> for the
  * format of the qualifier string.</li>
  * </ol>
  *
  * <p>
  * <code>ModuleVersion</code> objects are immutable.
  */
 class US_EXPORT ModuleVersion {
 
 private:
 
   friend class ModulePrivate;
 
   unsigned int majorVersion;
   unsigned int minorVersion;
   unsigned int microVersion;
   std::string      qualifier;
 
   static const char SEPARATOR; //  = "."
 
   bool undefined;
 
 
   /**
    * Called by the ModuleVersion constructors to validate the version components.
    *
    * @return <code>true</code> if the validation was successfull, <code>false</code> otherwise.
    */
   void Validate();
 
   ModuleVersion& operator=(const ModuleVersion& v);
 
   explicit ModuleVersion(bool undefined = false);
 
 public:
 
   /**
    * The empty version "0.0.0".
    */
   static ModuleVersion EmptyVersion();
 
   /**
    * Creates an undefined version identifier, representing either
    * infinity or minus infinity.
    */
   static ModuleVersion UndefinedVersion();
 
   /**
    * Creates a version identifier from the specified numerical components.
    *
    * <p>
    * The qualifier is set to the empty string.
    *
    * @param majorVersion Major component of the version identifier.
    * @param minorVersion Minor component of the version identifier.
    * @param microVersion Micro component of the version identifier.
    *
    */
   ModuleVersion(unsigned int majorVersion, unsigned int minorVersion, unsigned int microVersion);
 
   /**
    * Creates a version identifier from the specified components.
    *
    * @param majorVersion Major component of the version identifier.
    * @param minorVersion Minor component of the version identifier.
    * @param microVersion Micro component of the version identifier.
    * @param qualifier Qualifier component of the version identifier.
    */
   ModuleVersion(unsigned int majorVersion, unsigned int minorVersion, unsigned int microVersion, const std::string& qualifier);
 
   /**
    * Created a version identifier from the specified string.
    *
    * <p>
    * Here is the grammar for version strings.
    *
    * <pre>
    * version ::= majorVersion('.'minorVersion('.'microVersion('.'qualifier)?)?)?
    * majorVersion ::= digit+
    * minorVersion ::= digit+
    * microVersion ::= digit+
    * qualifier ::= (alpha|digit|'_'|'-')+
    * digit ::= [0..9]
    * alpha ::= [a..zA..Z]
    * </pre>
    *
    * There must be no whitespace in version.
    *
    * @param version string representation of the version identifier.
    */
   ModuleVersion(const std::string& version);
 
   /**
    * Create a version identifier from another.
    *
    * @param version Another version identifier
    */
   ModuleVersion(const ModuleVersion& version);
 
 
   /**
    * Parses a version identifier from the specified string.
    *
    * <p>
    * See <code>ModuleVersion(const std::string&)</code> for the format of the version string.
    *
    * @param version string representation of the version identifier. Leading
    *        and trailing whitespace will be ignored.
    * @return A <code>ModuleVersion</code> object representing the version
    *         identifier. If <code>version</code> is the empty string
    *         then <code>EmptyVersion</code> will be
    *         returned.
    */
   static ModuleVersion ParseVersion(const std::string& version);
 
   /**
    * Returns the undefined state of this version identifier.
    *
    * @return <code>true</code> if this version identifier is undefined,
    *         <code>false</code> otherwise.
    */
   bool IsUndefined() const;
 
   /**
    * Returns the majorVersion component of this version identifier.
    *
    * @return The majorVersion component.
    */
   unsigned int GetMajor() const;
 
   /**
    * Returns the minorVersion component of this version identifier.
    *
    * @return The minorVersion component.
    */
   unsigned int GetMinor() const;
 
   /**
    * Returns the microVersion component of this version identifier.
    *
    * @return The microVersion component.
    */
   unsigned int GetMicro() const;
 
   /**
    * Returns the qualifier component of this version identifier.
    *
    * @return The qualifier component.
    */
   std::string GetQualifier() const;
 
   /**
    * Returns the string representation of this version identifier.
    *
    * <p>
    * The format of the version string will be <code>majorVersion.minorVersion.microVersion</code>
    * if qualifier is the empty string or
    * <code>majorVersion.minorVersion.microVersion.qualifier</code> otherwise.
    *
    * @return The string representation of this version identifier.
    */
   std::string ToString() const;
 
   /**
    * Compares this <code>ModuleVersion</code> object to another object.
    *
    * <p>
    * A version is considered to be <b>equal to </b> another version if the
    * majorVersion, minorVersion and microVersion components are equal and the qualifier component
    * is equal.
    *
    * @param object The <code>ModuleVersion</code> object to be compared.
    * @return <code>true</code> if <code>object</code> is a
    *         <code>ModuleVersion</code> and is equal to this object;
    *         <code>false</code> otherwise.
    */
   bool operator==(const ModuleVersion& object) const;
 
   /**
    * Compares this <code>ModuleVersion</code> object to another object.
    *
    * <p>
    * A version is considered to be <b>less than </b> another version if its
    * majorVersion component is less than the other version's majorVersion component, or the
    * majorVersion components are equal and its minorVersion component is less than the other
    * version's minorVersion component, or the majorVersion and minorVersion components are equal
    * and its microVersion component is less than the other version's microVersion component,
    * or the majorVersion, minorVersion and microVersion components are equal and it's qualifier
    * component is less than the other version's qualifier component (using
    * <code>std::string::operator<()</code>).
    *
    * <p>
    * A version is considered to be <b>equal to</b> another version if the
    * majorVersion, minorVersion and microVersion components are equal and the qualifier component
    * is equal.
    *
    * @param object The <code>ModuleVersion</code> object to be compared.
    * @return A negative integer, zero, or a positive integer if this object is
    *         less than, equal to, or greater than the specified
    *         <code>ModuleVersion</code> object.
    */
   int Compare(const ModuleVersion& object) const;
 
 };
 
 US_END_NAMESPACE
 
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
 /**
  * \ingroup MicroServices
  */
 US_EXPORT std::ostream& operator<<(std::ostream& os, const US_PREPEND_NAMESPACE(ModuleVersion)& v);
 
 #endif // USMODULEVERSION_H
diff --git a/Core/Code/CppMicroServices/src/service/usServiceException.h b/Core/Code/CppMicroServices/src/service/usServiceException.h
index 7213499358..210697801b 100644
--- a/Core/Code/CppMicroServices/src/service/usServiceException.h
+++ b/Core/Code/CppMicroServices/src/service/usServiceException.h
@@ -1,127 +1,126 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #ifndef USSERVICEEXCEPTION_H
 #define USSERVICEEXCEPTION_H
 
 #include <stdexcept>
 
-#include <usExportMacros.h>
+#include <usConfig.h>
 
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4275)
 #endif
 
 US_BEGIN_NAMESPACE
 
 /**
  * \ingroup MicroServices
  *
  * A service exception used to indicate that a service problem occurred.
  *
  * <p>
  * A <code>ServiceException</code> object is created by the framework or
  * to denote an exception condition in the service. An enum
  * type is used to identify the exception type for future extendability.
  *
  * <p>
  * This exception conforms to the general purpose exception chaining mechanism.
  */
 class US_EXPORT ServiceException : public std::runtime_error
 {
 public:
 
   enum Type {
     /**
      * No exception type is unspecified.
      */
     UNSPECIFIED = 0,
     /**
      * The service has been unregistered.
      */
     UNREGISTERED = 1,
     /**
      * The service factory produced an invalid service object.
      */
     FACTORY_ERROR = 2,
     /**
      * The service factory threw an exception.
      */
     FACTORY_EXCEPTION = 3,
     /**
      * An error occurred invoking a remote service.
      */
     REMOTE = 5,
     /**
      * The service factory resulted in a recursive call to itself for the
      * requesting module.
      */
     FACTORY_RECURSION = 6
   };
 
   /**
    * Creates a <code>ServiceException</code> with the specified message,
    * type and exception cause.
    *
    * @param msg The associated message.
    * @param type The type for this exception.
-   * @param cause The cause of this exception.
    */
   ServiceException(const std::string& msg, const Type& type = UNSPECIFIED);
 
   ServiceException(const ServiceException& o);
   ServiceException& operator=(const ServiceException& o);
 
   ~ServiceException() throw() { }
 
   /**
    * Returns the type for this exception or <code>UNSPECIFIED</code> if the
    * type was unspecified or unknown.
    *
    * @return The type of this exception.
    */
   Type GetType() const;
 
 private:
 
   /**
    * Type of service exception.
    */
   Type type;
 
 };
 
 US_END_NAMESPACE
 
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
 /**
  * \ingroup MicroServices
  * @{
  */
 US_EXPORT std::ostream& operator<<(std::ostream& os, const US_PREPEND_NAMESPACE(ServiceException)& exc);
 /** @}*/
 
 #endif // USSERVICEEXCEPTION_H
diff --git a/Core/Code/CppMicroServices/src/service/usServiceInterface.h b/Core/Code/CppMicroServices/src/service/usServiceInterface.h
index 535bba1ba3..de734d2b95 100644
--- a/Core/Code/CppMicroServices/src/service/usServiceInterface.h
+++ b/Core/Code/CppMicroServices/src/service/usServiceInterface.h
@@ -1,53 +1,55 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #ifndef USSERVICEINTERFACE_H
 #define USSERVICEINTERFACE_H
 
+#include <usConfig.h>
+
 template<class T> inline const char* us_service_interface_iid()
 { return 0; }
 
 #if defined(QT_DEBUG) || defined(QT_NODEBUG)
 #include <qobject.h>
 
 #define US_DECLARE_SERVICE_INTERFACE(IFace, IId)                                 \
   template<> inline const char* qobject_interface_iid<IFace *>()                 \
   { return IId; }                                                                \
   template<> inline const char* us_service_interface_iid<IFace *>()              \
   { return IId; }                                                                \
   template<> inline IFace *qobject_cast<IFace *>(QObject *object)                \
-  { return reinterpret_cast<IFace *>((object ? object->qt_metacast(IId) : 0)); } \
+  { return dynamic_cast<IFace*>(reinterpret_cast<US_BASECLASS_NAME *>((object ? object->qt_metacast(IId) : 0))); } \
   template<> inline IFace *qobject_cast<IFace *>(const QObject *object)          \
-  { return reinterpret_cast<IFace *>((object ? const_cast<QObject *>(object)->qt_metacast(IId) : 0)); }
+  { return dynamic_cast<IFace*>(reinterpret_cast<US_BASECLASS_NAME *>((object ? const_cast<QObject *>(object)->qt_metacast(IId) : 0))); }
 
 #else
 
 #define US_DECLARE_SERVICE_INTERFACE(IFace, IId)                                 \
   template<> inline const char* us_service_interface_iid<IFace *>()              \
   { return IId; }                                                                \
 
 #endif
 
 template<class T> inline const char* us_service_impl_name(T* /*impl*/)
 { return "(unknown implementation)"; }
 
 #endif // USSERVICEINTERFACE_H
diff --git a/Core/Code/CppMicroServices/src/service/usServiceListenerEntry_p.h b/Core/Code/CppMicroServices/src/service/usServiceListenerEntry_p.h
index 0405371878..c51f6217fd 100644
--- a/Core/Code/CppMicroServices/src/service/usServiceListenerEntry_p.h
+++ b/Core/Code/CppMicroServices/src/service/usServiceListenerEntry_p.h
@@ -1,97 +1,97 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #ifndef USSERVICELISTENERENTRY_H
 #define USSERVICELISTENERENTRY_H
 
-#include <usUtils.h>
+#include <usUtils_p.h>
 #include <usModuleContext.h>
 
 #include "usLDAPExpr_p.h"
 
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4396)
 #endif
 
 US_BEGIN_NAMESPACE
 
 class Module;
 class ServiceListenerEntryData;
 
 /**
  * Data structure for saving service listener info. Contains
  * the optional service listener filter, in addition to the info
  * in ListenerEntry.
  */
 class ServiceListenerEntry
 {
 
 public:
 
   typedef US_SERVICE_LISTENER_FUNCTOR ServiceListener;
 
   ServiceListenerEntry(const ServiceListenerEntry& other);
   ~ServiceListenerEntry();
   ServiceListenerEntry& operator=(const ServiceListenerEntry& other);
 
   bool operator==(const ServiceListenerEntry& other) const;
 
   bool operator<(const ServiceListenerEntry& other) const;
 
   void SetRemoved(bool removed) const;
   bool IsRemoved() const;
 
   ServiceListenerEntry(Module* mc, const ServiceListener& l, const std::string& filter = "");
 
   Module* GetModule() const;
 
   std::string GetFilter() const;
 
   LDAPExpr GetLDAPExpr() const;
 
   LDAPExpr::LocalCache& GetLocalCache() const;
 
   void CallDelegate(const ServiceEvent& event) const;
 
 private:
 
   US_HASH_FUNCTION_FRIEND(ServiceListenerEntry);
   
   ExplicitlySharedDataPointer<ServiceListenerEntryData> d;
 };
 
 US_END_NAMESPACE
 
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
 US_HASH_FUNCTION_NAMESPACE_BEGIN
 US_HASH_FUNCTION_BEGIN(US_PREPEND_NAMESPACE(ServiceListenerEntry))
 
 return US_HASH_FUNCTION(const US_PREPEND_NAMESPACE(ServiceListenerEntryData)*, arg.d.ConstData());
 
 US_HASH_FUNCTION_END
 US_HASH_FUNCTION_NAMESPACE_END
 
 #endif // USSERVICELISTENERENTRY_H
diff --git a/Core/Code/CppMicroServices/src/service/usServiceListeners.cpp b/Core/Code/CppMicroServices/src/service/usServiceListeners.cpp
index 39d24ce341..76fc5c663f 100644
--- a/Core/Code/CppMicroServices/src/service/usServiceListeners.cpp
+++ b/Core/Code/CppMicroServices/src/service/usServiceListeners.cpp
@@ -1,289 +1,289 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
-#include "usUtils.h"
+#include "usUtils_p.h"
 
 #include "usServiceListeners_p.h"
 #include "usServiceReferencePrivate.h"
 
 #include "usModule.h"
 
 //#include <usLogMacros.h>
 
 US_BEGIN_NAMESPACE
 
 const int ServiceListeners::OBJECTCLASS_IX = 0;
 const int ServiceListeners::SERVICE_ID_IX = 1;
 
 ServiceListeners::ServiceListeners()
 {
   hashedServiceKeys.push_back(ServiceConstants::OBJECTCLASS());
   hashedServiceKeys.push_back(ServiceConstants::SERVICE_ID());
 }
 
 void ServiceListeners::AddServiceListener(ModuleContext* mc, const ServiceListenerEntry::ServiceListener& listener,
                         const std::string& filter)
 {
   MutexLocker lock(mutex);
 
   ServiceListenerEntry sle(mc->GetModule(), listener, filter);
   if (serviceSet.find(sle) != serviceSet.end())
   {
     RemoveServiceListener_unlocked(sle);
   }
   serviceSet.insert(sle);
   CheckSimple(sle);
 }
 
 void ServiceListeners::RemoveServiceListener(ModuleContext* mc, const ServiceListenerEntry::ServiceListener& listener)
 {
   ServiceListenerEntry entryToRemove(mc->GetModule(), listener);
 
   MutexLocker lock(mutex);
   RemoveServiceListener_unlocked(entryToRemove);
 }
 
 void ServiceListeners::RemoveServiceListener_unlocked(const ServiceListenerEntry& entryToRemove)
 {
   for (ServiceListenerEntries::iterator it = serviceSet.begin();
        it != serviceSet.end(); ++it)
   {
     if (it->operator ==(entryToRemove))
     {
       it->SetRemoved(true);
       RemoveFromCache(*it);
       serviceSet.erase(it);
       break;
     }
   }
 }
 
 void ServiceListeners::AddModuleListener(ModuleContext* mc, const ModuleListener& listener)
 {
   MutexLocker lock(moduleListenerMapMutex);
   std::list<ModuleListener>& listeners = moduleListenerMap[mc];
   if (std::find_if(listeners.begin(), listeners.end(), std::bind1st(ModuleListenerCompare(), listener)) == listeners.end())
   {
     listeners.push_back(listener);
   }
 }
 
 void ServiceListeners::RemoveModuleListener(ModuleContext* mc, const ModuleListener& listener)
 {
   MutexLocker lock(moduleListenerMapMutex);
   moduleListenerMap[mc].remove_if(std::bind1st(ModuleListenerCompare(), listener));
 }
 
 void ServiceListeners::ModuleChanged(const ModuleEvent& evt)
 {
   MutexLocker lock(moduleListenerMapMutex);
   for(ModuleListenerMap::iterator i = moduleListenerMap.begin();
       i != moduleListenerMap.end(); ++i)
   {
     for(std::list<ModuleListener>::iterator j = i->second.begin();
         j != i->second.end(); ++j)
     {
       (*j)(evt);
     }
   }
 }
 
 void ServiceListeners::RemoveAllListeners(ModuleContext* mc)
 {
   {
     MutexLocker lock(mutex);
     for (ServiceListenerEntries::iterator it = serviceSet.begin();
          it != serviceSet.end(); )
     {
 
       if (it->GetModule() == mc->GetModule())
       {
         RemoveFromCache(*it);
         serviceSet.erase(it++);
       }
       else
       {
         ++it;
       }
     }
   }
 
   {
     MutexLocker lock(moduleListenerMapMutex);
     moduleListenerMap.erase(mc);
   }
 }
 
 void ServiceListeners::ServiceChanged(const ServiceListenerEntries& receivers,
                                       const ServiceEvent& evt)
 {
   ServiceListenerEntries matchBefore;
   ServiceChanged(receivers, evt, matchBefore);
 }
 
 void ServiceListeners::ServiceChanged(const ServiceListenerEntries& receivers,
                                       const ServiceEvent& evt,
                                       ServiceListenerEntries& matchBefore)
 {
   ServiceReference sr = evt.GetServiceReference();
   int n = 0;
 
   for (ServiceListenerEntries::const_iterator l = receivers.begin();
        l != receivers.end(); ++l)
   {
     if (!matchBefore.empty())
     {
       matchBefore.erase(*l);
     }
 
     if (!l->IsRemoved())
     {
       try
       {
         ++n;
         l->CallDelegate(evt);
       }
       catch (...)
       {
-        US_ERROR << "Service listener"
+        US_WARN << "Service listener"
             #ifdef US_MODULE_SUPPORT_ENABLED
-                 << " in " << l->GetModule()->GetName()
+                << " in " << l->GetModule()->GetName()
             #endif
-                 << " threw an exception!";
+                << " threw an exception!";
       }
     }
   }
 
   //US_DEBUG << "Notified " << n << " listeners";
 }
 
 void ServiceListeners::GetMatchingServiceListeners(const ServiceReference& sr, ServiceListenerEntries& set,
                                                    bool lockProps)
 {
   MutexLocker lock(mutex);
 
   // Check complicated or empty listener filters
   int n = 0;
   for (std::list<ServiceListenerEntry>::const_iterator sse = complicatedListeners.begin();
        sse != complicatedListeners.end(); ++sse)
   {
     ++n;
     if (sse->GetLDAPExpr().IsNull() ||
         sse->GetLDAPExpr().Evaluate(sr.d->GetProperties(), false))
     {
       set.insert(*sse);
     }
   }
 
   //US_DEBUG << "Added " << set.size() << " out of " << n
   //         << " listeners with complicated filters";
 
   // Check the cache
   const std::list<std::string> c(any_cast<std::list<std::string> >
                                  (sr.d->GetProperty(ServiceConstants::OBJECTCLASS(), lockProps)));
   for (std::list<std::string>::const_iterator objClass = c.begin();
        objClass != c.end(); ++objClass)
   {
     AddToSet(set, OBJECTCLASS_IX, *objClass);
   }
 
   long service_id = any_cast<long>(sr.d->GetProperty(ServiceConstants::SERVICE_ID(), lockProps));
   std::stringstream ss;
   ss << service_id;
   AddToSet(set, SERVICE_ID_IX, ss.str());
 }
 
 void ServiceListeners::RemoveFromCache(const ServiceListenerEntry& sle)
 {
   if (!sle.GetLocalCache().empty())
   {
     for (std::size_t i = 0; i < hashedServiceKeys.size(); ++i)
     {
       CacheType& keymap = cache[i];
       std::vector<std::string>& l = sle.GetLocalCache()[i];
       for (std::vector<std::string>::const_iterator it = l.begin();
            it != l.end(); ++it)
       {
         std::list<ServiceListenerEntry>& sles = keymap[*it];
         sles.remove(sle);
         if (sles.empty())
         {
           keymap.erase(*it);
         }
       }
     }
   }
   else
   {
     complicatedListeners.remove(sle);
   }
 }
 
  void ServiceListeners::CheckSimple(const ServiceListenerEntry& sle) {
    if (sle.GetLDAPExpr().IsNull())
    {
      complicatedListeners.push_back(sle);
    }
    else
    {
      LDAPExpr::LocalCache local_cache;
      if (sle.GetLDAPExpr().IsSimple(hashedServiceKeys, local_cache, false))
      {
        sle.GetLocalCache() = local_cache;
        for (std::size_t i = 0; i < hashedServiceKeys.size(); ++i)
        {
          for (std::vector<std::string>::const_iterator it = local_cache[i].begin();
               it != local_cache[i].end(); ++it)
          {
            std::list<ServiceListenerEntry>& sles = cache[i][*it];
            sles.push_back(sle);
          }
        }
      }
      else
      {
        //US_DEBUG << "Too complicated filter: " << sle.GetFilter();
        complicatedListeners.push_back(sle);
      }
    }
  }
 
 void ServiceListeners::AddToSet(ServiceListenerEntries& set,
                                 int cache_ix, const std::string& val)
 {
   std::list<ServiceListenerEntry>& l = cache[cache_ix][val];
   if (!l.empty())
   {
     //US_DEBUG << hashedServiceKeys[cache_ix] << " matches " << l.size();
 
     for (std::list<ServiceListenerEntry>::const_iterator entry = l.begin();
          entry != l.end(); ++entry)
     {
       set.insert(*entry);
     }
   }
   else
   {
     //US_DEBUG << hashedServiceKeys[cache_ix] << " matches none";
   }
 }
 
 US_END_NAMESPACE
diff --git a/Core/Code/CppMicroServices/src/service/usServiceProperties.h b/Core/Code/CppMicroServices/src/service/usServiceProperties.h
index 94adc70f50..4cebbd8086 100644
--- a/Core/Code/CppMicroServices/src/service/usServiceProperties.h
+++ b/Core/Code/CppMicroServices/src/service/usServiceProperties.h
@@ -1,198 +1,199 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #ifndef US_SERVICE_PROPERTIES_H
 #define US_SERVICE_PROPERTIES_H
 
 
 #include <usConfig.h>
 
 #include <cctype>
 
-#include <usExportMacros.h>
 #include "usAny.h"
 
-
+/// \cond
 US_BEGIN_NAMESPACE
 
 struct ci_char_traits : public std::char_traits<char>
     // just inherit all the other functions
     //  that we don't need to override
 {
     
   static bool eq(char c1, char c2)
   {
     return std::toupper(c1) == std::toupper(c2);
   }
 
   static bool ne(char c1, char c2)
   {
     return std::toupper(c1) != std::toupper(c2);
   }
 
   static bool lt(char c1, char c2)
   {
     return std::toupper(c1) < std::toupper(c2);
   }
 
   static bool gt(char c1, char c2)
   {
     return std::toupper(c1) > std::toupper(c2);
   }
 
   static int compare(const char* s1, const char* s2, std::size_t n)
   {
     while (n-- > 0)
     {
       if (lt(*s1, *s2)) return -1;
       if (gt(*s1, *s2)) return 1;
       ++s1; ++s2;
     }
     return 0;
   }
 
   static const char* find(const char* s, int n, char a)
   {
     while (n-- > 0 && std::toupper(*s) != std::toupper(a))
     {
       ++s;
     }
     return s;
   }
 
 };
 
 class ci_string : public std::basic_string<char, ci_char_traits>
 {
 private:
 
   typedef std::basic_string<char, ci_char_traits> Super;
 
 public:
 
   inline ci_string() : Super() {}
   inline ci_string(const ci_string& cistr) : Super(cistr) {}
   inline ci_string(const ci_string& cistr, size_t pos, size_t n) : Super(cistr, pos, n) {}
   inline ci_string(const char* s, size_t n) : Super(s, n) {}
   inline ci_string(const char* s) : Super(s) {}
   inline ci_string(size_t n, char c) : Super(n, c) {}
 
   inline ci_string(const std::string& str) : Super(str.begin(), str.end()) {}
 
   template<class InputIterator> ci_string(InputIterator b, InputIterator e)
     : Super(b, e)
   {}
 
   inline operator std::string () const
   {
     return std::string(begin(), end());
   }
 };
 
 US_END_NAMESPACE
 
 US_HASH_FUNCTION_NAMESPACE_BEGIN
 US_HASH_FUNCTION_BEGIN(US_PREPEND_NAMESPACE(ci_string))
 
   std::string ls(arg);
   std::transform(ls.begin(), ls.end(), ls.begin(), ::tolower);
 
   using namespace US_HASH_FUNCTION_NAMESPACE;
   return US_HASH_FUNCTION(std::string, ls);
 
 US_HASH_FUNCTION_END
 US_HASH_FUNCTION_NAMESPACE_END
 
+/// \endcond
+
 US_BEGIN_NAMESPACE
 
 /**
  * \ingroup MicroServices
  *
  * A hash table based map class with case-insensitive keys. This class
  * uses ci_string as key type and Any as values. Due
  * to the conversion capabilities of ci_string, std::string objects
  * can be used transparantly to insert or retrieve key-value pairs.
  *
  * <p>
  * Note that the case of the keys will be preserved.
  */
 typedef US_UNORDERED_MAP_TYPE<ci_string, Any> ServiceProperties;
 
 /**
  * \ingroup MicroServices
  */
 namespace ServiceConstants {
 
 /**
  * Service property identifying all of the class names under which a service
  * was registered in the framework. The value of this property must be of
  * type <code>std::list&lt;std::string&gt;</code>.
  *
  * <p>
  * This property is set by the framework when a service is registered.
  */
 US_EXPORT const std::string& OBJECTCLASS(); // = "objectclass"
 
 /**
  * Service property identifying a service's registration number. The value
  * of this property must be of type <code>long int</code>.
  *
  * <p>
  * The value of this property is assigned by the framework when a service is
  * registered. The framework assigns a unique value that is larger than all
  * previously assigned values since the framework was started. These values
  * are NOT persistent across restarts of the framework.
  */
 US_EXPORT const std::string& SERVICE_ID(); // = "service.id"
 
 /**
  * Service property identifying a service's ranking number.
  *
  * <p>
  * This property may be supplied in the
  * <code>ServiceProperties</code> object passed to the
  * <code>ModuleContext::RegisterService</code> method. The value of this
  * property must be of type <code>int</code>.
  *
  * <p>
  * The service ranking is used by the framework to determine the <i>natural
  * order</i> of services, see ServiceReference::operator<(const ServiceReference&),
  * and the <i>default</i> service to be returned from a call to the
  * {@link ModuleContext::GetServiceReference} method.
  *
  * <p>
  * The default ranking is zero (0). A service with a ranking of
  * <code>std::numeric_limits<int>::max()</code> is very likely to be returned as the
  * default service, whereas a service with a ranking of
  * <code>std::numeric_limits<int>::min()</code> is very unlikely to be returned.
  *
  * <p>
  * If the supplied property value is not of type <code>int</code>, it is
  * deemed to have a ranking value of zero.
  */
 US_EXPORT const std::string& SERVICE_RANKING(); // = "service.ranking"
 
 }
 
 US_END_NAMESPACE
 
 #endif // US_SERVICE_PROPERTIES_H
diff --git a/Core/Code/CppMicroServices/src/service/usServiceReference.h b/Core/Code/CppMicroServices/src/service/usServiceReference.h
index 4b2b7c644d..95a402d440 100644
--- a/Core/Code/CppMicroServices/src/service/usServiceReference.h
+++ b/Core/Code/CppMicroServices/src/service/usServiceReference.h
@@ -1,226 +1,225 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 #ifndef USSERVICEREFERENCE_H
 #define USSERVICEREFERENCE_H
 
-#include <usExportMacros.h>
 #include <usAny.h>
 
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4396)
 #endif
 
 US_BEGIN_NAMESPACE
 
 class Module;
 class ServiceRegistrationPrivate;
 class ServiceReferencePrivate;
 
 /**
  * \ingroup MicroServices
  *
  * A reference to a service.
  *
  * <p>
  * The framework returns <code>ServiceReference</code> objects from the
  * <code>ModuleContext::GetServiceReference</code> and
  * <code>ModuleContext::GetServiceReferences</code> methods.
  * <p>
  * A <code>ServiceReference</code> object may be shared between modules and
  * can be used to examine the properties of the service and to get the service
  * object.
  * <p>
  * Every service registered in the framework has a unique
  * <code>ServiceRegistration</code> object and may have multiple, distinct
  * <code>ServiceReference</code> objects referring to it.
  * <code>ServiceReference</code> objects associated with a
  * <code>ServiceRegistration</code> are considered equal
  * (more specifically, their <code>operator==()</code>
  * method will return <code>true</code> when compared).
  * <p>
  * If the same service object is registered multiple times,
  * <code>ServiceReference</code> objects associated with different
  * <code>ServiceRegistration</code> objects are not equal.
  *
  * @see ModuleContext::GetServiceReference
  * @see ModuleContext::GetServiceReferences
  * @see ModuleContext::GetService
  * @remarks This class is thread safe.
  */
 class US_EXPORT ServiceReference {
 
 public:
 
   /**
    * Creates an invalid ServiceReference object. You can use
    * this object in boolean expressions and it will evaluate to
    * <code>false</code>.
    */
   ServiceReference();
 
   ServiceReference(const ServiceReference& ref);
 
   /**
    * Converts this ServiceReference instance into a boolean
    * expression. If this instance was default constructed or
    * the service it references has been unregistered, the conversion
    * returns <code>false</code>, otherwise it returns <code>true</code>.
    */
   operator bool() const;
 
   /**
    * Releases any resources held or locked by this
    * <code>ServiceReference</code> and renders it invalid.
    */
   ServiceReference& operator=(int null);
 
   ~ServiceReference();
 
   /**
    * Returns the property value to which the specified property key is mapped
    * in the properties <code>ServiceProperties</code> object of the service
    * referenced by this <code>ServiceReference</code> object.
    *
    * <p>
    * Property keys are case-insensitive.
    *
    * <p>
    * This method continues to return property values after the service has
    * been unregistered. This is so references to unregistered services can
    * still be interrogated.
    *
    * @param key The property key.
    * @return The property value to which the key is mapped; an invalid Any
    *         if there is no property named after the key.
    */
   Any GetProperty(const std::string& key) const;
 
   /**
    * Returns a list of the keys in the <code>ServiceProperties</code>
    * object of the service referenced by this <code>ServiceReference</code>
    * object.
    *
    * <p>
    * This method will continue to return the keys after the service has been
    * unregistered. This is so references to unregistered services can
    * still be interrogated.
    *
    * @param keys A vector being filled with the property keys.
    */
   void GetPropertyKeys(std::vector<std::string>& keys) const;
 
   /**
    * Returns the module that registered the service referenced by this
    * <code>ServiceReference</code> object.
    *
    * <p>
    * This method must return <code>0</code> when the service has been
    * unregistered. This can be used to determine if the service has been
    * unregistered.
    *
    * @return The module that registered the service referenced by this
    *         <code>ServiceReference</code> object; <code>0</code> if that
    *         service has already been unregistered.
    * @see ModuleContext::RegisterService(const std::vector<std::string>&, US_BASECLASS_NAME*, const ServiceProperties&)
    */
   Module* GetModule() const;
 
   /**
    * Returns the modules that are using the service referenced by this
    * <code>ServiceReference</code> object. Specifically, this method returns
    * the modules whose usage count for that service is greater than zero.
    *
    * @param modules A list of modules whose usage count for the service referenced
    *         by this <code>ServiceReference</code> object is greater than
    *         zero.
    */
   void GetUsingModules(std::vector<Module*>& modules) const;
 
   /**
    * Compares this <code>ServiceReference</code> with the specified
    * <code>ServiceReference</code> for order.
    *
    * <p>
    * If this <code>ServiceReference</code> and the specified
-   * <code>ServiceReference</code> have the same {@link ServiceProperties::SERVICE_ID
-   * service id} they are equal. This <code>ServiceReference</code> is less
+   * <code>ServiceReference</code> have the same \link ServiceConstants::SERVICE_ID()
+   * service id\endlink they are equal. This <code>ServiceReference</code> is less
    * than the specified <code>ServiceReference</code> if it has a lower
-   * {@link ServiceProperties::SERVICE_RANKING service ranking} and greater if it has a
+   * {@link ServiceConstants::SERVICE_RANKING service ranking} and greater if it has a
    * higher service ranking. Otherwise, if this <code>ServiceReference</code>
    * and the specified <code>ServiceReference</code> have the same
-   * {@link ServiceProperties::SERVICE_RANKING service ranking}, this
+   * {@link ServiceConstants::SERVICE_RANKING service ranking}, this
    * <code>ServiceReference</code> is less than the specified
    * <code>ServiceReference</code> if it has a higher
-   * {@link ServiceProperties::SERVICE_ID service id} and greater if it has a lower
+   * {@link ServiceConstants::SERVICE_ID service id} and greater if it has a lower
    * service id.
    *
    * @param reference The <code>ServiceReference</code> to be compared.
    * @return Returns a false or true if this
    *         <code>ServiceReference</code> is less than or greater
    *         than the specified <code>ServiceReference</code>.
    */
   bool operator<(const ServiceReference& reference) const;
 
   bool operator==(const ServiceReference& reference) const;
 
   ServiceReference& operator=(const ServiceReference& reference);
 
 
 private:
 
   friend class ModulePrivate;
   friend class ModuleContext;
   friend class ServiceFilter;
   friend class ServiceRegistrationPrivate;
   friend class ServiceListeners;
   friend class LDAPFilter;
 
   template<class S, class T> friend class ServiceTracker;
   template<class S, class T> friend class ServiceTrackerPrivate;
   template<class S, class R, class T> friend class ModuleAbstractTracked;
 
   US_HASH_FUNCTION_FRIEND(ServiceReference);
 
   std::size_t Hash() const;
   
   ServiceReference(ServiceRegistrationPrivate* reg);
 
   ServiceReferencePrivate* d;
 
 };
 
 US_END_NAMESPACE
 
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
 US_EXPORT std::ostream& operator<<(std::ostream& os, const US_PREPEND_NAMESPACE(ServiceReference)& serviceRef);
 
 US_HASH_FUNCTION_NAMESPACE_BEGIN
 US_HASH_FUNCTION_BEGIN(US_PREPEND_NAMESPACE(ServiceReference))
   return arg.Hash();
 US_HASH_FUNCTION_END
 US_HASH_FUNCTION_NAMESPACE_END
 
 #endif // USSERVICEREFERENCE_H
diff --git a/Core/Code/CppMicroServices/src/service/usServiceReferencePrivate.h b/Core/Code/CppMicroServices/src/service/usServiceReferencePrivate.h
index a8b83b3b91..5dfc241a84 100644
--- a/Core/Code/CppMicroServices/src/service/usServiceReferencePrivate.h
+++ b/Core/Code/CppMicroServices/src/service/usServiceReferencePrivate.h
@@ -1,118 +1,118 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #ifndef USSERVICEREFERENCEPRIVATE_H
 #define USSERVICEREFERENCEPRIVATE_H
 
-#include "usAtomicInt.h"
+#include "usAtomicInt_p.h"
 
 #include "usServiceProperties.h"
 
 
 US_BEGIN_NAMESPACE
 
 class Module;
 class ServiceRegistrationPrivate;
 class ServiceReferencePrivate;
 
 
 /**
  * \ingroup MicroServices
  */
 class ServiceReferencePrivate
 {
 public:
 
   ServiceReferencePrivate(ServiceRegistrationPrivate* reg);
 
   ~ServiceReferencePrivate();
 
   /**
     * Get the service object.
     *
     * @param module requester of service.
     * @return Service requested or null in case of failure.
     */
   US_BASECLASS_NAME* GetService(Module* module);
 
   /**
    * Unget the service object.
    *
    * @param module Module who wants remove service.
    * @param checkRefCounter If true decrement refence counter and remove service
    *                        if we reach zero. If false remove service without
    *                        checking refence counter.
    * @return True if service was remove or false if only refence counter was
    *         decremented.
    */
   bool UngetService(Module* module, bool checkRefCounter);
 
   /**
    * Get all properties registered with this service.
    *
    * @return A ServiceProperties object containing properties or being empty
    *         if service has been removed.
    */
   ServiceProperties GetProperties() const;
 
   /**
    * Returns the property value to which the specified property key is mapped
    * in the properties <code>ServiceProperties</code> object of the service
    * referenced by this <code>ServiceReference</code> object.
    *
    * <p>
    * Property keys are case-insensitive.
    *
    * <p>
    * This method must continue to return property values after the service has
    * been unregistered. This is so references to unregistered services can
    * still be interrogated.
    *
    * @param key The property key.
    * @param lock If <code>true</code>, access of the properties of the service
    * referenced by this <code>ServiceReference</code> object will be
    * synchronized.
    * @return The property value to which the key is mapped; an invalid Any
    * if there is no property named after the key.
    */
   Any GetProperty(const std::string& key, bool lock) const;
 
   /**
    * Reference count for implicitly shared private implementation.
    */
   AtomicInt ref;
 
   /**
    * Link to registration object for this reference.
    */
   ServiceRegistrationPrivate* const registration;
 
 private:
 
   // purposely not implemented
   ServiceReferencePrivate(const ServiceReferencePrivate&);
   ServiceReferencePrivate& operator=(const ServiceReferencePrivate&);
 };
 
 US_END_NAMESPACE
 
 #endif // USSERVICEREFERENCEPRIVATE_H
diff --git a/Core/Code/CppMicroServices/src/service/usServiceRegistration.h b/Core/Code/CppMicroServices/src/service/usServiceRegistration.h
index 1592de8a4a..4861cb051d 100644
--- a/Core/Code/CppMicroServices/src/service/usServiceRegistration.h
+++ b/Core/Code/CppMicroServices/src/service/usServiceRegistration.h
@@ -1,191 +1,191 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 #ifndef USSERVICEREGISTRATION_H
 #define USSERVICEREGISTRATION_H
 
 #include "usServiceProperties.h"
 #include "usServiceReference.h"
 
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4396)
 #endif
 
 US_BEGIN_NAMESPACE
 
 class ModulePrivate;
 
 /**
  * \ingroup MicroServices
  *
  * A registered service.
  *
  * <p>
  * The framework returns a <code>ServiceRegistration</code> object when a
  * <code>ModuleContext#RegisterService()</code> method invocation is successful.
  * The <code>ServiceRegistration</code> object is for the private use of the
  * registering module and should not be shared with other modules.
  * <p>
  * The <code>ServiceRegistration</code> object may be used to update the
  * properties of the service or to unregister the service.
  *
  * @see ModuleContext#RegisterService()
  * @remarks This class is thread safe.
  */
 class US_EXPORT ServiceRegistration {
 
 public:
 
   /**
    * Creates an invalid ServiceRegistration object. You can use
    * this object in boolean expressions and it will evaluate to
    * <code>false</code>.
    */
   ServiceRegistration();
 
   ServiceRegistration(const ServiceRegistration& reg);
 
   operator bool() const;
 
   /**
    * Releases any resources held or locked by this
    * <code>ServiceRegistration</code> and renders it invalid.
    */
   ServiceRegistration& operator=(int null);
 
   ~ServiceRegistration();
 
   /**
    * Returns a <code>ServiceReference</code> object for a service being
    * registered.
    * <p>
    * The <code>ServiceReference</code> object may be shared with other
    * modules.
    *
    * @throws std::logic_error If this
    *         <code>ServiceRegistration</code> object has already been
    *         unregistered or if it is invalid.
    * @return <code>ServiceReference</code> object.
    */
   ServiceReference GetReference() const;
 
   /**
    * Updates the properties associated with a service.
    *
    * <p>
-   * The {@link ServiceProperties#OBJECTCLASS} and {@link ServiceProperties#SERVICE_ID} keys
+   * The ServiceConstants#OBJECTCLASS and ServiceConstants#SERVICE_ID keys
    * cannot be modified by this method. These values are set by the framework
    * when the service is registered in the environment.
    *
    * <p>
    * The following steps are taken to modify service properties:
    * <ol>
    * <li>The service's properties are replaced with the provided properties.
    * <li>A service event of type {@link ServiceEvent#MODIFIED} is fired.
    * </ol>
    *
    * @param properties The properties for this service. See {@link ServiceProperties}
    *        for a list of standard service property keys. Changes should not
    *        be made to this object after calling this method. To update the
    *        service's properties this method should be called again.
    *
    * @throws std::logic_error If this <code>ServiceRegistration</code>
    *         object has already been unregistered or if it is invalid.
    * @throws std::invalid_argument If <code>properties</code> contains
    *         case variants of the same key name.
    */
   void SetProperties(const ServiceProperties& properties);
 
   /**
    * Unregisters a service. Remove a <code>ServiceRegistration</code> object
    * from the framework service registry. All <code>ServiceRegistration</code>
    * objects associated with this <code>ServiceRegistration</code> object
    * can no longer be used to interact with the service once unregistration is
    * complete.
    *
    * <p>
    * The following steps are taken to unregister a service:
    * <ol>
    * <li>The service is removed from the framework service registry so that
    * it can no longer be obtained.
    * <li>A service event of type {@link ServiceEvent#UNREGISTERING} is fired
    * so that modules using this service can release their use of the service.
    * Once delivery of the service event is complete, the
    * <code>ServiceRegistration</code> objects for the service may no longer be
    * used to get a service object for the service.
    * <li>For each module whose use count for this service is greater than
    * zero: <br>
    * The module's use count for this service is set to zero. <br>
    * If the service was registered with a {@link ServiceFactory} object, the
    * <code>ServiceFactory#UngetService</code> method is called to release
    * the service object for the module.
    * </ol>
    *
    * @throws std::logic_error If this
    *         <code>ServiceRegistration</code> object has already been
    *         unregistered or if it is invalid.
    * @see ModuleContext#UngetService
    * @see ServiceFactory#UngetService
    */
   void Unregister();
 
   bool operator<(const ServiceRegistration& o) const;
 
   bool operator==(const ServiceRegistration& registration) const;
 
   ServiceRegistration& operator=(const ServiceRegistration& registration);
 
 
 protected:
 
   friend class ServiceRegistry;
   friend class ServiceReferencePrivate;
   US_HASH_FUNCTION_FRIEND(ServiceRegistration);
 
   ServiceRegistration(ServiceRegistrationPrivate* registrationPrivate);
 
   ServiceRegistration(ModulePrivate* module, US_BASECLASS_NAME* service,
                       const ServiceProperties& props);
 
   ServiceRegistrationPrivate* d;
 
 };
 
 US_END_NAMESPACE
 
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
 US_HASH_FUNCTION_NAMESPACE_BEGIN
 US_HASH_FUNCTION_BEGIN(US_PREPEND_NAMESPACE(ServiceRegistration))
   return US_HASH_FUNCTION(US_PREPEND_NAMESPACE(ServiceRegistrationPrivate)*, arg.d);
 US_HASH_FUNCTION_END
 US_HASH_FUNCTION_NAMESPACE_END
 
 
 inline std::ostream& operator<<(std::ostream& os, const US_PREPEND_NAMESPACE(ServiceRegistration)& /*reg*/)
 {
   return os << "US_PREPEND_NAMESPACE(ServiceRegistration) object";
 }
 
 #endif // USSERVICEREGISTRATION_H
diff --git a/Core/Code/CppMicroServices/src/service/usServiceRegistrationPrivate.h b/Core/Code/CppMicroServices/src/service/usServiceRegistrationPrivate.h
index ed3486094c..a2099c07f0 100644
--- a/Core/Code/CppMicroServices/src/service/usServiceRegistrationPrivate.h
+++ b/Core/Code/CppMicroServices/src/service/usServiceRegistrationPrivate.h
@@ -1,143 +1,143 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #ifndef USSERVICEREGISTRATIONPRIVATE_H
 #define USSERVICEREGISTRATIONPRIVATE_H
 
 #include "usServiceReference.h"
 #include "usServiceProperties.h"
-#include "usAtomicInt.h"
+#include "usAtomicInt_p.h"
 
 US_BEGIN_NAMESPACE
 
 class ModulePrivate;
 class ServiceRegistration;
 
 /**
  * \ingroup MicroServices
  */
 class ServiceRegistrationPrivate
 {
 
 protected:
 
   friend class ServiceRegistration;
 
   // The ServiceReferencePrivate class holds a pointer to a
   // ServiceRegistrationPrivate instance and needs to manipulate
   // its reference count. This way it can keep the ServiceRegistrationPrivate
   // instance alive and keep returning service properties for
   // unregistered service instances.
   friend class ServiceReferencePrivate;
 
   /**
    * Reference count for implicitly shared private implementation.
    */
   AtomicInt ref;
 
   /**
    * Service or ServiceFactory object.
    */
   US_BASECLASS_NAME* service;
 
 public:
 
   typedef Mutex MutexType;
   typedef MutexLock<MutexType> MutexLocker;
 
   typedef US_UNORDERED_MAP_TYPE<Module*,int> ModuleToRefsMap;
   typedef US_UNORDERED_MAP_TYPE<Module*, US_BASECLASS_NAME*> ModuleToServicesMap;
 
   /**
    * Modules dependent on this service. Integer is used as
    * reference counter, counting number of unbalanced getService().
    */
   ModuleToRefsMap dependents;
 
   /**
    * Object instances that factory has produced.
    */
   ModuleToServicesMap serviceInstances;
 
   /**
    * Module registering this service.
    */
   ModulePrivate* module;
 
   /**
    * Reference object to this service registration.
    */
   ServiceReference reference;
 
   /**
    * Service properties.
    */
   ServiceProperties properties;
 
   /**
    * Is service available. I.e., if <code>true</code> then holders
    * of a ServiceReference for the service are allowed to get it.
    */
   volatile bool available;
 
   /**
    * Avoid recursive unregistrations. I.e., if <code>true</code> then
    * unregistration of this service has started but is not yet
    * finished.
    */
   volatile bool unregistering;
 
   /**
    * Lock object for synchronous event delivery.
    */
   MutexType eventLock;
 
   // needs to be recursive
   MutexType propsLock;
 
   ServiceRegistrationPrivate(ModulePrivate* module, US_BASECLASS_NAME* service,
                              const ServiceProperties& props);
 
   ~ServiceRegistrationPrivate();
 
   /**
    * Check if a module uses this service
    *
    * @param p Module to check
    * @return true if module uses this service
    */
   bool IsUsedByModule(Module* m);
 
   US_BASECLASS_NAME* GetService();
 
 private:
 
   // purposely not implemented
   ServiceRegistrationPrivate(const ServiceRegistrationPrivate&);
   ServiceRegistrationPrivate& operator=(const ServiceRegistrationPrivate&);
 
 };
 
 US_END_NAMESPACE
 
 
 #endif // USSERVICEREGISTRATIONPRIVATE_H
diff --git a/Core/Code/CppMicroServices/src/service/usServiceRegistry.cpp b/Core/Code/CppMicroServices/src/service/usServiceRegistry.cpp
index 3525088959..6ae3263cbe 100644
--- a/Core/Code/CppMicroServices/src/service/usServiceRegistry.cpp
+++ b/Core/Code/CppMicroServices/src/service/usServiceRegistry.cpp
@@ -1,335 +1,335 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 #include <usConfig.h>
 
 #include <iterator>
 #include <stdexcept>
 
 #ifdef US_ENABLE_SERVICE_FACTORY_SUPPORT
 #include US_BASECLASS_HEADER
 #endif
 
 #include "usServiceRegistry_p.h"
 #include "usServiceFactory.h"
 #include "usServiceRegistry_p.h"
 #include "usServiceRegistrationPrivate.h"
 #include "usModulePrivate.h"
 #include "usCoreModuleContext_p.h"
 
 
 US_BEGIN_NAMESPACE
 
 typedef MutexLock<ServiceRegistry::MutexType> MutexLocker;
 
 
 struct ServiceRegistrationComparator
 {
   bool operator()(const ServiceRegistration& a, const ServiceRegistration& b) const
   {
     return a < b;
   }
 };
 
 ServiceProperties ServiceRegistry::CreateServiceProperties(const ServiceProperties& in,
                                                            const std::list<std::string>& classes,
                                                            long sid)
 {
   static long nextServiceID = 1;
   ServiceProperties props(in);
 
   if (!classes.empty())
   {
     props.insert(std::make_pair(ServiceConstants::OBJECTCLASS(), classes));
   }
 
   props.insert(std::make_pair(ServiceConstants::SERVICE_ID(), sid != -1 ? sid : nextServiceID++));
 
   return props;
 }
 
 ServiceRegistry::ServiceRegistry(CoreModuleContext* coreCtx)
   : core(coreCtx)
 {
 
 }
 
 ServiceRegistry::~ServiceRegistry()
 {
   Clear();
 }
 
 void ServiceRegistry::Clear()
 {
   services.clear();
   serviceRegistrations.clear();
   classServices.clear();
   core = 0;
 }
 
 ServiceRegistration ServiceRegistry::RegisterService(ModulePrivate* module,
                                                      const std::list<std::string>& classes,
                                                      US_BASECLASS_NAME* service,
                                                      const ServiceProperties& properties)
 {
   if (service == 0)
   {
     throw std::invalid_argument("Can't register 0 as a service");
   }
 
   // Check if service implements claimed classes and that they exist.
   for (std::list<std::string>::const_iterator i = classes.begin();
        i != classes.end(); ++i)
   {
     if (i->empty())
     {
       throw std::invalid_argument("Can't register as null class");
     }
 
     #ifdef US_ENABLE_SERVICE_FACTORY_SUPPORT
     if (!(dynamic_cast<ServiceFactory*>(service)))
     #endif
     {
       if (!CheckServiceClass(service, *i))
       {
         std::string msg;
         std::stringstream ss(msg);
         ss << "Service class " << us_service_impl_name(service) << " is not an instance of "
                << (*i) << ". Maybe you forgot to export the RTTI information for the interface.";
         throw std::invalid_argument(msg);
       }
     }
   }
 
   ServiceRegistration res(module, service,
                           CreateServiceProperties(properties, classes));
   {
     MutexLocker lock(mutex);
     services.insert(std::make_pair(res, classes));
     serviceRegistrations.push_back(res);
     for (std::list<std::string>::const_iterator i = classes.begin();
          i != classes.end(); ++i)
     {
       std::list<ServiceRegistration>& s = classServices[*i];
       std::list<ServiceRegistration>::iterator ip =
           std::lower_bound(s.begin(), s.end(), res, ServiceRegistrationComparator());
       s.insert(ip, res);
     }
   }
 
   ServiceReference r = res.GetReference();
   ServiceListeners::ServiceListenerEntries listeners;
   module->coreCtx->listeners.GetMatchingServiceListeners(r, listeners);
   module->coreCtx->listeners.ServiceChanged(listeners,
                                             ServiceEvent(ServiceEvent::REGISTERED, r));
   return res;
 }
 
 void ServiceRegistry::UpdateServiceRegistrationOrder(const ServiceRegistration& sr,
                                                      const std::list<std::string>& classes)
 {
   MutexLocker lock(mutex);
   for (std::list<std::string>::const_iterator i = classes.begin();
        i != classes.end(); ++i)
   {
     std::list<ServiceRegistration>& s = classServices[*i];
     std::remove(s.begin(), s.end(), sr);
     s.insert(std::lower_bound(s.begin(), s.end(), sr, ServiceRegistrationComparator()), sr);
   }
 }
 
 bool ServiceRegistry::CheckServiceClass(US_BASECLASS_NAME* , const std::string& ) const
 {
   //return service->inherits(cls.toAscii());
   // No possibility to check inheritance based on string literals.
   return true;
 }
 
 void ServiceRegistry::Get(const std::string& clazz,
                           std::list<ServiceRegistration>& serviceRegs) const
 {
   MutexLocker lock(mutex);
   MapClassServices::const_iterator i = classServices.find(clazz);
   if (i != classServices.end())
   {
     serviceRegs = i->second;
   }
 }
 
 ServiceReference ServiceRegistry::Get(ModulePrivate* module, const std::string& clazz) const
 {
   MutexLocker lock(mutex);
   try
   {
     std::list<ServiceReference> srs;
     Get_unlocked(clazz, "", module, srs);
-    US_INFO << "get service ref " << clazz << " for module "
+    US_DEBUG << "get service ref " << clazz << " for module "
              << module->info.name << " = " << srs.size() << " refs";
 
     if (!srs.empty())
     {
       return srs.front();
     }
   }
   catch (const std::invalid_argument& )
   { }
 
   return ServiceReference();
 }
 
 void ServiceRegistry::Get(const std::string& clazz, const std::string& filter,
                           ModulePrivate* module, std::list<ServiceReference>& res) const
 {
   MutexLocker lock(mutex);
   Get_unlocked(clazz, filter, module, res);
 }
 
 void ServiceRegistry::Get_unlocked(const std::string& clazz, const std::string& filter,
                           ModulePrivate* /*module*/, std::list<ServiceReference>& res) const
 {
   std::list<ServiceRegistration>::const_iterator s;
   std::list<ServiceRegistration>::const_iterator send;
   std::list<ServiceRegistration> v;
   LDAPExpr ldap;
   if (clazz.empty())
   {
     if (!filter.empty())
     {
       ldap = LDAPExpr(filter);
       LDAPExpr::ObjectClassSet matched;
       if (ldap.GetMatchedObjectClasses(matched))
       {
         v.clear();
         for(LDAPExpr::ObjectClassSet::const_iterator className = matched.begin();
             className != matched.end(); ++className)
         {
           MapClassServices::const_iterator i = classServices.find(*className);
           if (i != classServices.end())
           {
             std::copy(i->second.begin(), i->second.end(), std::back_inserter(v));
           }
         }
         if (!v.empty())
         {
           s = v.begin();
           send = v.end();
         }
         else
         {
           return;
         }
       }
       else
       {
         s = serviceRegistrations.begin();
         send = serviceRegistrations.end();
       }
     }
     else
     {
       s = serviceRegistrations.begin();
       send = serviceRegistrations.end();
     }
   }
   else
   {
     MapClassServices::const_iterator it = classServices.find(clazz);
     if (it != classServices.end())
     {
       s = it->second.begin();
       send = it->second.end();
     }
     else
     {
       return;
     }
     if (!filter.empty())
     {
       ldap = LDAPExpr(filter);
     }
   }
 
   for (; s != send; ++s)
   {
     ServiceReference sri = s->GetReference();
 
     if (filter.empty() || ldap.Evaluate(s->d->properties, false))
     {
       res.push_back(sri);
     }
   }
 }
 
 void ServiceRegistry::RemoveServiceRegistration(const ServiceRegistration& sr)
 {
   MutexLocker lock(mutex);
 
   const std::list<std::string>& classes = ref_any_cast<std::list<std::string> >(
         sr.d->properties[ServiceConstants::OBJECTCLASS()]);
   services.erase(sr);
   serviceRegistrations.remove(sr);
   for (std::list<std::string>::const_iterator i = classes.begin();
        i != classes.end(); ++i)
   {
     std::list<ServiceRegistration>& s = classServices[*i];
     if (s.size() > 1)
     {
       std::remove(s.begin(), s.end(), sr);
     }
     else
     {
       classServices.erase(*i);
     }
   }
 }
 
 void ServiceRegistry::GetRegisteredByModule(ModulePrivate* p,
                                             std::list<ServiceRegistration>& res) const
 {
   MutexLocker lock(mutex);
 
   for (std::list<ServiceRegistration>::const_iterator i = serviceRegistrations.begin();
        i != serviceRegistrations.end(); ++i)
   {
     if (i->d->module == p)
     {
       res.push_back(*i);
     }
   }
 }
 
 void ServiceRegistry::GetUsedByModule(Module* p,
                                       std::list<ServiceRegistration>& res) const
 {
   MutexLocker lock(mutex);
 
   for (std::list<ServiceRegistration>::const_iterator i = serviceRegistrations.begin();
        i != serviceRegistrations.end(); ++i)
   {
     if (i->d->IsUsedByModule(p))
     {
       res.push_back(*i);
     }
   }
 }
 
 US_END_NAMESPACE
 
diff --git a/Core/Code/CppMicroServices/src/service/usServiceRegistry_p.h b/Core/Code/CppMicroServices/src/service/usServiceRegistry_p.h
index f160948bd9..6235296cd6 100644
--- a/Core/Code/CppMicroServices/src/service/usServiceRegistry_p.h
+++ b/Core/Code/CppMicroServices/src/service/usServiceRegistry_p.h
@@ -1,196 +1,196 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #ifndef USSERVICEREGISTRY_H
 #define USSERVICEREGISTRY_H
 
 #include <list>
 
 #include "usServiceRegistration.h"
 #include "usServiceProperties.h"
 
-#include "usThreads.h"
+#include "usThreads_p.h"
 
 US_BEGIN_NAMESPACE
 
 class CoreModuleContext;
 class ModulePrivate;
 
 
 /**
  * Here we handle all the US services that are registered.
  */
 class ServiceRegistry
 {
 
 public:
 
   typedef Mutex MutexType;
 
   mutable MutexType mutex;
 
   /**
    * Creates a new ServiceProperties object containing <code>in</code>
    * with the keys converted to lower case.
    *
    * @param classes A list of class names which will be added to the
    *        created ServiceProperties object under the key
    *        ModuleConstants::OBJECTCLASS.
    * @param sid A service id which will be used instead of a default one.
    */
   static ServiceProperties CreateServiceProperties(const ServiceProperties& in,
                                                    const std::list<std::string>& classes = std::list<std::string>(),
                                                    long sid = -1);
 
   typedef US_UNORDERED_MAP_TYPE<ServiceRegistration, std::list<std::string> > MapServiceClasses;
   typedef US_UNORDERED_MAP_TYPE<std::string, std::list<ServiceRegistration> > MapClassServices;
 
   /**
    * All registered services in the current framework.
    * Mapping of registered service to class names under which
    * the service is registerd.
    */
   MapServiceClasses services;
 
   std::list<ServiceRegistration> serviceRegistrations;
 
   /**
    * Mapping of classname to registered service.
    * The List of registered services are ordered with the highest
    * ranked service first.
    */
   MapClassServices classServices;
 
   CoreModuleContext* core;
 
   ServiceRegistry(CoreModuleContext* coreCtx);
 
   ~ServiceRegistry();
 
   void Clear();
 
   /**
    * Register a service in the framework wide register.
    *
    * @param module The module registering the service.
    * @param classes The class names under which the service can be located.
    * @param service The service object.
    * @param properties The properties for this service.
    * @return A ServiceRegistration object.
    * @exception std::invalid_argument If one of the following is true:
    * <ul>
    * <li>The service object is 0.</li>
    * <li>The service parameter is not a ServiceFactory or an
    * instance of all the named classes in the classes parameter.</li>
    * </ul>
    */
   ServiceRegistration RegisterService(ModulePrivate* module,
                                       const std::list<std::string>& clazzes,
                                       US_BASECLASS_NAME* service,
                                       const ServiceProperties& properties);
 
   /**
    * Service ranking changed, reorder registered services
    * according to ranking.
    *
    * @param serviceRegistration The ServiceRegistrationPrivate object.
    * @param rank New rank of object.
    */
   void UpdateServiceRegistrationOrder(const ServiceRegistration& sr,
                                       const std::list<std::string>& classes);
 
   /**
    * Checks that a given service object is an instance of the given
    * class name.
    *
    * @param service The service object to check.
    * @param cls     The class name to check for.
    */
   bool CheckServiceClass(US_BASECLASS_NAME* service, const std::string& cls) const;
 
   /**
    * Get all services implementing a certain class.
    * Only used internally by the framework.
    *
    * @param clazz The class name of the requested service.
    * @return A sorted list of {@link ServiceRegistrationPrivate} objects.
    */
   void Get(const std::string& clazz, std::list<ServiceRegistration>& serviceRegs) const;
 
   /**
    * Get a service implementing a certain class.
    *
    * @param module The module requesting reference
    * @param clazz The class name of the requested service.
    * @return A {@link ServiceReference} object.
    */
   ServiceReference Get(ModulePrivate* module, const std::string& clazz) const;
 
   /**
    * Get all services implementing a certain class and then
    * filter these with a property filter.
    *
    * @param clazz The class name of requested service.
    * @param filter The property filter.
    * @param module The module requesting reference.
    * @return A list of {@link ServiceReference} object.
    */
   void Get(const std::string& clazz, const std::string& filter,
            ModulePrivate* module, std::list<ServiceReference>& serviceRefs) const;
 
   /**
    * Remove a registered service.
    *
    * @param sr The ServiceRegistration object that is registered.
    */
   void RemoveServiceRegistration(const ServiceRegistration& sr) ;
 
   /**
    * Get all services that a module has registered.
    *
    * @param p The module
    * @return A set of {@link ServiceRegistration} objects
    */
   void GetRegisteredByModule(ModulePrivate* m, std::list<ServiceRegistration>& serviceRegs) const;
 
   /**
    * Get all services that a module uses.
    *
    * @param p The module
    * @return A set of {@link ServiceRegistration} objects
    */
   void GetUsedByModule(Module* m, std::list<ServiceRegistration>& serviceRegs) const;
 
 private:
 
   void Get_unlocked(const std::string& clazz, const std::string& filter,
                     ModulePrivate* module, std::list<ServiceReference>& serviceRefs) const;
 
   // purposely not implemented
   ServiceRegistry(const ServiceRegistry&);
   ServiceRegistry& operator=(const ServiceRegistry&);
 
 };
 
 US_END_NAMESPACE
 
 #endif // USSERVICEREGISTRY_H
diff --git a/Core/Code/CppMicroServices/src/service/usServiceTracker.h b/Core/Code/CppMicroServices/src/service/usServiceTracker.h
index 3bdd535921..0a08b98e84 100644
--- a/Core/Code/CppMicroServices/src/service/usServiceTracker.h
+++ b/Core/Code/CppMicroServices/src/service/usServiceTracker.h
@@ -1,433 +1,433 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #ifndef USSERVICETRACKER_H
 #define USSERVICETRACKER_H
 
 #include <map>
 
 #include "usServiceReference.h"
 #include "usServiceTrackerCustomizer.h"
 #include "usLDAPFilter.h"
 
 US_BEGIN_NAMESPACE
 
 template<class S, class T> class TrackedService;
 template<class S, class T> class ServiceTrackerPrivate;
 class ModuleContext;
 
 /**
  * \ingroup MicroServices
  *
  * The <code>ServiceTracker</code> class simplifies using services from the
  * framework's service registry.
  * <p>
  * A <code>ServiceTracker</code> object is constructed with search criteria and
  * a <code>ServiceTrackerCustomizer</code> object. A <code>ServiceTracker</code>
  * can use a <code>ServiceTrackerCustomizer</code> to customize the service
  * objects to be tracked. The <code>ServiceTracker</code> can then be opened to
  * begin tracking all services in the framework's service registry that match
  * the specified search criteria. The <code>ServiceTracker</code> correctly
  * handles all of the details of listening to <code>ServiceEvent</code>s and
  * getting and ungetting services.
  * <p>
  * The <code>GetServiceReferences</code> method can be called to get references
  * to the services being tracked. The <code>GetService</code> and
  * <code>GetServices</code> methods can be called to get the service objects for
  * the tracked service.
  * <p>
  * The <code>ServiceTracker</code> class is thread-safe. It does not call a
  * <code>ServiceTrackerCustomizer</code> while holding any locks.
  * <code>ServiceTrackerCustomizer</code> implementations must also be
  * thread-safe.
  *
  * \tparam S The type of the service being tracked. The type must be an
  *         assignable datatype. Further, if the
  *         <code>ServiceTracker(ModuleContext*, ServiceTrackerCustomizer<T>*)</code>
  *         constructor is used, the type must have an associated interface id via
  *         US_DECLARE_SERVICE_INTERFACE.
  * \tparam T The type of the tracked object. The type must be an assignable
  *         datatype, provide a boolean conversion function, and provide
  *         a constructor and an assignment operator which can handle 0 as an argument.
  * \remarks This class is thread safe.
  */
 template<class S = US_BASECLASS_NAME*, class T = S>
 class ServiceTracker : protected ServiceTrackerCustomizer<T>
 {
 public:
 
   typedef std::map<ServiceReference,T> TrackingMap;
 
   ~ServiceTracker();
 
   /**
    * Create a <code>ServiceTracker</code> on the specified
    * <code>ServiceReference</code>.
    *
    * <p>
    * The service referenced by the specified <code>ServiceReference</code>
    * will be tracked by this <code>ServiceTracker</code>.
    *
    * @param context The <code>ModuleContext</code> against which the tracking
    *        is done.
    * @param reference The <code>ServiceReference</code> for the service to be
    *        tracked.
    * @param customizer The customizer object to call when services are added,
    *        modified, or removed in this <code>ServiceTracker</code>. If
    *        customizer is <code>null</code>, then this
    *        <code>ServiceTracker</code> will be used as the
    *        <code>ServiceTrackerCustomizer</code> and this
    *        <code>ServiceTracker</code> will call the
    *        <code>ServiceTrackerCustomizer</code> methods on itself.
    */
   ServiceTracker(ModuleContext* context,
                  const ServiceReference& reference,
                  ServiceTrackerCustomizer<T>* customizer = 0);
 
   /**
    * Create a <code>ServiceTracker</code> on the specified class name.
    *
    * <p>
    * Services registered under the specified class name will be tracked by
    * this <code>ServiceTracker</code>.
    *
    * @param context The <code>ModuleContext</code> against which the tracking
    *        is done.
    * @param clazz The class name of the services to be tracked.
    * @param customizer The customizer object to call when services are added,
    *        modified, or removed in this <code>ServiceTracker</code>. If
    *        customizer is <code>null</code>, then this
    *        <code>ServiceTracker</code> will be used as the
    *        <code>ServiceTrackerCustomizer</code> and this
    *        <code>ServiceTracker</code> will call the
    *        <code>ServiceTrackerCustomizer</code> methods on itself.
    */
   ServiceTracker(ModuleContext* context, const std::string& clazz,
                  ServiceTrackerCustomizer<T>* customizer = 0);
 
   /**
    * Create a <code>ServiceTracker</code> on the specified
    * <code>LDAPFilter</code> object.
    *
    * <p>
    * Services which match the specified <code>LDAPFilter</code> object will be
    * tracked by this <code>ServiceTracker</code>.
    *
    * @param context The <code>ModuleContext</code> against which the tracking
    *        is done.
    * @param filter The <code>LDAPFilter</code> to select the services to be
    *        tracked.
    * @param customizer The customizer object to call when services are added,
    *        modified, or removed in this <code>ServiceTracker</code>. If
    *        customizer is null, then this <code>ServiceTracker</code> will be
    *        used as the <code>ServiceTrackerCustomizer</code> and this
    *        <code>ServiceTracker</code> will call the
    *        <code>ServiceTrackerCustomizer</code> methods on itself.
    */
   ServiceTracker(ModuleContext* context, const LDAPFilter& filter,
                  ServiceTrackerCustomizer<T>* customizer = 0);
 
   /**
    * Create a <code>ServiceTracker</code> on the class template
    * argument S.
    *
    * <p>
    * Services registered under the interface name of the class template
    * argument S will be tracked by this <code>ServiceTracker</code>.
    *
    * @param context The <code>ModuleContext</code> against which the tracking
    *        is done.
    * @param customizer The customizer object to call when services are added,
    *        modified, or removed in this <code>ServiceTracker</code>. If
    *        customizer is null, then this <code>ServiceTracker</code> will be
    *        used as the <code>ServiceTrackerCustomizer</code> and this
    *        <code>ServiceTracker</code> will call the
    *        <code>ServiceTrackerCustomizer</code> methods on itself.
    */
   ServiceTracker(ModuleContext* context, ServiceTrackerCustomizer<T>* customizer = 0);
 
   /**
    * Open this <code>ServiceTracker</code> and begin tracking services.
    *
    * <p>
    * Services which match the search criteria specified when this
    * <code>ServiceTracker</code> was created are now tracked by this
    * <code>ServiceTracker</code>.
    *
    * @throws std::logic_error If the <code>ModuleContext</code>
    *         with which this <code>ServiceTracker</code> was created is no
    *         longer valid.
    */
   virtual void Open();
 
   /**
    * Close this <code>ServiceTracker</code>.
    *
    * <p>
    * This method should be called when this <code>ServiceTracker</code> should
    * end the tracking of services.
    *
    * <p>
    * This implementation calls GetServiceReferences() to get the list
    * of tracked services to remove.
    */
   virtual void Close();
 
   /**
    * Wait for at least one service to be tracked by this
    * <code>ServiceTracker</code>. This method will also return when this
    * <code>ServiceTracker</code> is closed.
    *
    * <p>
    * It is strongly recommended that <code>WaitForService</code> is not used
    * during the calling of the <code>ModuleActivator</code> methods.
    * <code>ModuleActivator</code> methods are expected to complete in a short
    * period of time.
    *
    * <p>
    * This implementation calls GetService() to determine if a service
    * is being tracked.
    *
    * @return Returns the result of GetService().
    */
   virtual T WaitForService(unsigned long timeoutMillis = 0);
 
   /**
    * Return a list of <code>ServiceReference</code>s for all services being
    * tracked by this <code>ServiceTracker</code>.
    *
    * @param refs List of <code>ServiceReference</code>s.
    */
   virtual void GetServiceReferences(std::list<ServiceReference>& refs) const;
 
   /**
    * Returns a <code>ServiceReference</code> for one of the services being
    * tracked by this <code>ServiceTracker</code>.
    *
    * <p>
    * If multiple services are being tracked, the service with the highest
    * ranking (as specified in its <code>service.ranking</code> property) is
    * returned. If there is a tie in ranking, the service with the lowest
    * service ID (as specified in its <code>service.id</code> property); that
    * is, the service that was registered first is returned. This is the same
    * algorithm used by <code>ModuleContext::GetServiceReference()</code>.
    *
    * <p>
    * This implementation calls GetServiceReferences() to get the list
    * of references for the tracked services.
    *
    * @return A <code>ServiceReference</code> for a tracked service.
    * @throws ServiceException if no services are being tracked.
    */
   virtual ServiceReference GetServiceReference() const;
 
   /**
    * Returns the service object for the specified
    * <code>ServiceReference</code> if the specified referenced service is
    * being tracked by this <code>ServiceTracker</code>.
    *
    * @param reference The reference to the desired service.
    * @return A service object or <code>null</code> if the service referenced
    *         by the specified <code>ServiceReference</code> is not being
    *         tracked.
    */
   virtual T GetService(const ServiceReference& reference) const;
 
   /**
    * Return a list of service objects for all services being tracked by this
    * <code>ServiceTracker</code>.
    *
    * <p>
    * This implementation calls GetServiceReferences() to get the list
    * of references for the tracked services and then calls
    * GetService(const ServiceReference&) for each reference to get the
    * tracked service object.
    *
    * @param services A list of service objects or an empty list if no services
    *         are being tracked.
    */
   virtual void GetServices(std::list<T>& services) const;
 
   /**
    * Returns a service object for one of the services being tracked by this
    * <code>ServiceTracker</code>.
    *
    * <p>
    * If any services are being tracked, this implementation returns the result
    * of calling <code>%GetService(%GetServiceReference())</code>.
    *
    * @return A service object or <code>null</code> if no services are being
    *         tracked.
    */
   virtual T GetService() const;
 
   /**
    * Remove a service from this <code>ServiceTracker</code>.
    *
    * The specified service will be removed from this
    * <code>ServiceTracker</code>. If the specified service was being tracked
    * then the <code>ServiceTrackerCustomizer::RemovedService</code> method will
    * be called for that service.
    *
    * @param reference The reference to the service to be removed.
    */
   virtual void Remove(const ServiceReference& reference);
 
   /**
    * Return the number of services being tracked by this
    * <code>ServiceTracker</code>.
    *
    * @return The number of services being tracked.
    */
   virtual int Size() const;
 
   /**
    * Returns the tracking count for this <code>ServiceTracker</code>.
    *
    * The tracking count is initialized to 0 when this
    * <code>ServiceTracker</code> is opened. Every time a service is added,
    * modified or removed from this <code>ServiceTracker</code>, the tracking
    * count is incremented.
    *
    * <p>
    * The tracking count can be used to determine if this
    * <code>ServiceTracker</code> has added, modified or removed a service by
    * comparing a tracking count value previously collected with the current
    * tracking count value. If the value has not changed, then no service has
    * been added, modified or removed from this <code>ServiceTracker</code>
    * since the previous tracking count was collected.
    *
    * @return The tracking count for this <code>ServiceTracker</code> or -1 if
    *         this <code>ServiceTracker</code> is not open.
    */
   virtual int GetTrackingCount() const;
 
   /**
    * Return a sorted map of the <code>ServiceReference</code>s and
    * service objects for all services being tracked by this
    * <code>ServiceTracker</code>. The map is sorted in natural order
    * of <code>ServiceReference</code>. That is, the last entry is the service
    * with the highest ranking and the lowest service id.
    *
    * @param tracked A <code>TrackingMap</code> with the <code>ServiceReference</code>s
    *         and service objects for all services being tracked by this
    *         <code>ServiceTracker</code>. If no services are being tracked,
    *         then the returned map is empty.
    */
   virtual void GetTracked(TrackingMap& tracked) const;
 
   /**
    * Return if this <code>ServiceTracker</code> is empty.
    *
    * @return <code>true</code> if this <code>ServiceTracker</code> is not tracking any
    *         services.
    */
   virtual bool IsEmpty() const;
 
 protected:
 
   /**
    * Default implementation of the
    * <code>ServiceTrackerCustomizer::AddingService</code> method.
    *
    * <p>
    * This method is only called when this <code>ServiceTracker</code> has been
    * constructed with a <code>null</code> ServiceTrackerCustomizer argument.
    *
    * <p>
    * This implementation returns the result of calling <code>GetService</code>
    * on the <code>ModuleContext</code> with which this
    * <code>ServiceTracker</code> was created passing the specified
    * <code>ServiceReference</code>.
    * <p>
    * This method can be overridden in a subclass to customize the service
    * object to be tracked for the service being added. In that case, take care
    * not to rely on the default implementation of
    * \link RemovedService(const ServiceReference&, T service) removedService\endlink
    * to unget the service.
    *
    * @param reference The reference to the service being added to this
    *        <code>ServiceTracker</code>.
    * @return The service object to be tracked for the service added to this
    *         <code>ServiceTracker</code>.
    * @see ServiceTrackerCustomizer::AddingService(const ServiceReference&)
    */
   T AddingService(const ServiceReference& reference);
 
   /**
    * Default implementation of the
    * <code>ServiceTrackerCustomizer::ModifiedService</code> method.
    *
    * <p>
    * This method is only called when this <code>ServiceTracker</code> has been
    * constructed with a <code>null</code> ServiceTrackerCustomizer argument.
    *
    * <p>
    * This implementation does nothing.
    *
    * @param reference The reference to modified service.
    * @param service The service object for the modified service.
-   * @see ServiceTrackerCustomizer::ModifiedService(const ServiceReference&, itk::LighObject*)
+   * @see ServiceTrackerCustomizer::ModifiedService(const ServiceReference&, T)
    */
   void ModifiedService(const ServiceReference& reference, T service);
 
   /**
    * Default implementation of the
    * <code>ServiceTrackerCustomizer::RemovedService</code> method.
    *
    * <p>
    * This method is only called when this <code>ServiceTracker</code> has been
    * constructed with a <code>null</code> ServiceTrackerCustomizer argument.
    *
    * <p>
    * This implementation calls <code>UngetService</code>, on the
    * <code>ModuleContext</code> with which this <code>ServiceTracker</code>
    * was created, passing the specified <code>ServiceReference</code>.
    * <p>
    * This method can be overridden in a subclass. If the default
    * implementation of \link AddingService(const ServiceReference&) AddingService\endlink
    * method was used, this method must unget the service.
    *
    * @param reference The reference to removed service.
    * @param service The service object for the removed service.
-   * @see ServiceTrackerCustomizer::RemovedService(const ServiceReference&, itk::LighObject*)
+   * @see ServiceTrackerCustomizer::RemovedService(const ServiceReference&, T)
    */
   void RemovedService(const ServiceReference& reference, T service);
 
 private:
 
   typedef ServiceTracker<S,T> _ServiceTracker;
   typedef TrackedService<S,T> _TrackedService;
   typedef ServiceTrackerPrivate<S,T> _ServiceTrackerPrivate;
   typedef ServiceTrackerCustomizer<T> _ServiceTrackerCustomizer;
 
   friend class TrackedService<S,T>;
   friend class ServiceTrackerPrivate<S,T>;
 
   _ServiceTrackerPrivate* const d;
 };
 
 US_END_NAMESPACE
 
 #include "usServiceTracker.tpp"
 
 #endif // USSERVICETRACKER_H
diff --git a/Core/Code/CppMicroServices/src/service/usServiceTracker.tpp b/Core/Code/CppMicroServices/src/service/usServiceTracker.tpp
index 165a8a758c..742291b621 100644
--- a/Core/Code/CppMicroServices/src/service/usServiceTracker.tpp
+++ b/Core/Code/CppMicroServices/src/service/usServiceTracker.tpp
@@ -1,448 +1,448 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #include "usServiceTrackerPrivate.h"
-#include "usTrackedService.h"
+#include "usTrackedService_p.h"
 #include "usServiceException.h"
 #include "usModuleContext.h"
 
 #include <stdexcept>
 #include <limits>
 
 US_BEGIN_NAMESPACE
 
 template<class S, class T>
 ServiceTracker<S,T>::~ServiceTracker()
 {
   Close();
   delete d;
 }
 
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4355)
 #endif
 
 template<class S, class T>
 ServiceTracker<S,T>::ServiceTracker(ModuleContext* context,
                                     const ServiceReference& reference,
                                     _ServiceTrackerCustomizer* customizer)
   : d(new _ServiceTrackerPrivate(this, context, reference, customizer))
 {
 }
 
 template<class S, class T>
 ServiceTracker<S,T>::ServiceTracker(ModuleContext* context, const std::string& clazz,
                                     _ServiceTrackerCustomizer* customizer)
   : d(new _ServiceTrackerPrivate(this, context, clazz, customizer))
 {
 }
 
 template<class S, class T>
 ServiceTracker<S,T>::ServiceTracker(ModuleContext* context, const LDAPFilter& filter,
                                     _ServiceTrackerCustomizer* customizer)
   : d(new _ServiceTrackerPrivate(this, context, filter, customizer))
 {
 }
 
 template<class S, class T>
 ServiceTracker<S,T>::ServiceTracker(ModuleContext *context, ServiceTrackerCustomizer<T> *customizer)
   : d(new _ServiceTrackerPrivate(this, context, us_service_interface_iid<S>(), customizer))
 {
   const char* clazz = us_service_interface_iid<S>();
   if (clazz == 0) throw ServiceException("The service interface class has no US_DECLARE_SERVICE_INTERFACE macro");
 }
 
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
 template<class S, class T>
 void ServiceTracker<S,T>::Open()
 {
   _TrackedService* t;
   {
     typename _ServiceTrackerPrivate::Lock l(d);
     if (d->trackedService)
     {
       return;
     }
 
     US_DEBUG(d->DEBUG) << "ServiceTracker<S,T>::Open: " << d->filter;
 
     t = new _TrackedService(this, d->customizer);
     {
       typename _TrackedService::Lock l(*t);
       try {
         d->context->AddServiceListener(t, &_TrackedService::ServiceChanged, d->listenerFilter);
         std::list<ServiceReference> references;
         if (!d->trackClass.empty())
         {
           references = d->GetInitialReferences(d->trackClass, std::string());
         }
         else
         {
           if (d->trackReference.GetModule() != 0)
           {
             references.push_back(d->trackReference);
           }
           else
           { /* user supplied filter */
             references = d->GetInitialReferences(std::string(),
                                                  (d->listenerFilter.empty()) ? d->filter.ToString() : d->listenerFilter);
           }
         }
         /* set tracked with the initial references */
         t->SetInitial(references);
       }
       catch (const std::invalid_argument& e)
       {
         throw std::runtime_error(std::string("unexpected std::invalid_argument exception: ")
             + e.what());
       }
     }
     d->trackedService = t;
   }
   /* Call tracked outside of synchronized region */
   t->TrackInitial(); /* process the initial references */
 }
 
 template<class S, class T>
 void ServiceTracker<S,T>::Close()
 {
   _TrackedService* outgoing;
   std::list<ServiceReference> references;
   {
     typename _ServiceTrackerPrivate::Lock l(d);
     outgoing = d->trackedService;
     if (outgoing == 0)
     {
       return;
     }
     US_DEBUG(d->DEBUG) << "ServiceTracker<S,T>::close:" << d->filter;
     outgoing->Close();
     GetServiceReferences(references);
     d->trackedService = 0;
     try
     {
       d->context->RemoveServiceListener(outgoing, &_TrackedService::ServiceChanged);
     }
     catch (const std::logic_error& /*e*/)
     {
       /* In case the context was stopped. */
     }
   }
   d->Modified(); /* clear the cache */
   {
     typename _TrackedService::Lock l(outgoing);
     outgoing->NotifyAll(); /* wake up any waiters */
   }
   for(std::list<ServiceReference>::const_iterator ref = references.begin();
       ref != references.end(); ++ref)
   {
     outgoing->Untrack(*ref, ServiceEvent());
   }
 
   if (d->DEBUG)
   {
     typename _ServiceTrackerPrivate::Lock l(d);
     if ((d->cachedReference.GetModule() == 0) && (d->cachedService == 0))
     {
       US_DEBUG(true) << "ServiceTracker<S,T>::close[cached cleared]:"
                        << d->filter;
     }
   }
 
   delete outgoing;
   d->trackedService = 0;
 }
 
 template<class S, class T>
 T ServiceTracker<S,T>::WaitForService(unsigned long timeoutMillis)
 {
   T object = GetService();
   while (object == 0)
   {
     _TrackedService* t = d->Tracked();
     if (t == 0)
     { /* if ServiceTracker is not open */
       return 0;
     }
     {
       typename _TrackedService::Lock l(t);
       if (t->Size() == 0)
       {
         t->Wait(timeoutMillis);
       }
     }
     object = GetService();
   }
   return object;
 }
 
 template<class S, class T>
 void ServiceTracker<S,T>::GetServiceReferences(std::list<ServiceReference>& refs) const
 {
   _TrackedService* t = d->Tracked();
   if (t == 0)
   { /* if ServiceTracker is not open */
     return;
   }
   {
     typename _TrackedService::Lock l(t);
     d->GetServiceReferences_unlocked(refs, t);
   }
 }
 
 template<class S, class T>
 ServiceReference ServiceTracker<S,T>::GetServiceReference() const
 {
   ServiceReference reference(0);
   {
     typename _ServiceTrackerPrivate::Lock l(d);
     reference = d->cachedReference;
   }
   if (reference.GetModule() != 0)
   {
     US_DEBUG(d->DEBUG) << "ServiceTracker<S,T>::getServiceReference[cached]:"
                          << d->filter;
     return reference;
   }
   US_DEBUG(d->DEBUG) << "ServiceTracker<S,T>::getServiceReference:" << d->filter;
   std::list<ServiceReference> references;
   GetServiceReferences(references);
   int length = references.size();
   if (length == 0)
   { /* if no service is being tracked */
     throw ServiceException("No service is being tracked");
   }
   std::list<ServiceReference>::const_iterator selectedRef;
   if (length > 1)
   { /* if more than one service, select highest ranking */
     std::vector<int> rankings(length);
     int count = 0;
     int maxRanking = std::numeric_limits<int>::min();
     std::list<ServiceReference>::const_iterator refIter = references.begin();
     for (int i = 0; i < length; i++)
     {
       Any rankingAny = refIter->GetProperty(ServiceConstants::SERVICE_RANKING());
       int ranking = 0;
       if (rankingAny.Type() == typeid(int))
       {
         ranking = any_cast<int>(rankingAny);
       }
 
       rankings[i] = ranking;
       if (ranking > maxRanking)
       {
         selectedRef = refIter;
         maxRanking = ranking;
         count = 1;
       }
       else
       {
         if (ranking == maxRanking)
         {
           count++;
         }
       }
       ++refIter;
     }
     if (count > 1)
     { /* if still more than one service, select lowest id */
       long int minId = std::numeric_limits<long int>::max();
       refIter = references.begin();
       for (int i = 0; i < length; i++)
       {
         if (rankings[i] == maxRanking)
         {
           Any idAny = refIter->GetProperty(ServiceConstants::SERVICE_ID());
           long int id = 0;
           if (idAny.Type() == typeid(long int))
           {
             id = any_cast<long int>(idAny);
           }
           if (id < minId)
           {
             selectedRef = refIter;
             minId = id;
           }
         }
         ++refIter;
       }
     }
   }
 
   {
     typename _ServiceTrackerPrivate::Lock l(d);
     d->cachedReference = *selectedRef;
     return d->cachedReference;
   }
 }
 
 template<class S, class T>
 T ServiceTracker<S,T>::GetService(const ServiceReference& reference) const
 {
   _TrackedService* t = d->Tracked();
   if (t == 0)
   { /* if ServiceTracker is not open */
     return 0;
   }
   {
     typename _TrackedService::Lock l(t);
     return t->GetCustomizedObject(reference);
   }
 }
 
 template<class S, class T>
 void ServiceTracker<S,T>::GetServices(std::list<T>& services) const
 {
   _TrackedService* t = d->Tracked();
   if (t == 0)
   { /* if ServiceTracker is not open */
     return;
   }
   {
     typename _TrackedService::Lock l(t);
     std::list<ServiceReference> references;
     d->GetServiceReferences_unlocked(references, t);
     for(std::list<ServiceReference>::const_iterator ref = references.begin();
         ref != references.end(); ++ref)
     {
       services.push_back(t->GetCustomizedObject(*ref));
     }
   }
 }
 
 template<class S, class T>
 T ServiceTracker<S,T>::GetService() const
 {
   T service = d->cachedService;
   if (service != 0)
   {
     US_DEBUG(d->DEBUG) << "ServiceTracker<S,T>::getService[cached]:"
                          << d->filter;
     return service;
   }
   US_DEBUG(d->DEBUG) << "ServiceTracker<S,T>::getService:" << d->filter;
 
   try
   {
     ServiceReference reference = GetServiceReference();
     if (reference.GetModule() == 0)
     {
       return 0;
     }
     return d->cachedService = GetService(reference);
   }
   catch (const ServiceException&)
   {
     return 0;
   }
 }
 
 template<class S, class T>
 void ServiceTracker<S,T>::Remove(const ServiceReference& reference)
 {
   _TrackedService* t = d->Tracked();
   if (t == 0)
   { /* if ServiceTracker is not open */
     return;
   }
   t->Untrack(reference, ServiceEvent());
 }
 
 template<class S, class T>
 int ServiceTracker<S,T>::Size() const
 {
   _TrackedService* t = d->Tracked();
   if (t == 0)
   { /* if ServiceTracker is not open */
     return 0;
   }
   {
     typename _TrackedService::Lock l(t);
     return t->Size();
   }
 }
 
 template<class S, class T>
 int ServiceTracker<S,T>::GetTrackingCount() const
 {
   _TrackedService* t = d->Tracked();
   if (t == 0)
   { /* if ServiceTracker is not open */
     return -1;
   }
   {
     typename _TrackedService::Lock l(t);
     return t->GetTrackingCount();
   }
 }
 
 template<class S, class T>
 void ServiceTracker<S,T>::GetTracked(TrackingMap& map) const
 {
   _TrackedService* t = d->Tracked();
   if (t == 0)
   { /* if ServiceTracker is not open */
     return;
   }
   {
     typename _TrackedService::Lock l(t);
     t->CopyEntries(map);
   }
 }
 
 template<class S, class T>
 bool ServiceTracker<S,T>::IsEmpty() const
 {
   _TrackedService* t = d->Tracked();
   if (t == 0)
   { /* if ServiceTracker is not open */
     return true;
   }
   {
     typename _TrackedService::Lock l(t);
     return t->IsEmpty();
   }
 }
 
 template<class S, class T>
 T ServiceTracker<S,T>::AddingService(const ServiceReference& reference)
 {
  return dynamic_cast<T>(d->context->GetService(reference));
 }
 
 template<class S, class T>
 void ServiceTracker<S,T>::ModifiedService(const ServiceReference& /*reference*/, T /*service*/)
 {
   /* do nothing */
 }
 
 template<class S, class T>
 void ServiceTracker<S,T>::RemovedService(const ServiceReference& reference, T /*service*/)
 {
   d->context->UngetService(reference);
 }
 
 US_END_NAMESPACE
diff --git a/Core/Code/CppMicroServices/src/service/usServiceTrackerPrivate.tpp b/Core/Code/CppMicroServices/src/service/usServiceTrackerPrivate.tpp
index f34434c7c9..5346e14b40 100644
--- a/Core/Code/CppMicroServices/src/service/usServiceTrackerPrivate.tpp
+++ b/Core/Code/CppMicroServices/src/service/usServiceTrackerPrivate.tpp
@@ -1,144 +1,144 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
-#include "usTrackedService.h"
+#include "usTrackedService_p.h"
 
 #include "usModuleContext.h"
 #include "usLDAPFilter.h"
 
 #include <stdexcept>
 
 US_BEGIN_NAMESPACE
 
 template<class S, class T>
 const bool ServiceTrackerPrivate<S,T>::DEBUG = true;
 
 template<class S, class T>
 ServiceTrackerPrivate<S,T>::ServiceTrackerPrivate(
     ServiceTracker<S,T>* st, ModuleContext* context,
     const ServiceReference& reference,
     ServiceTrackerCustomizer<T>* customizer)
   : context(context), customizer(customizer), trackReference(reference),
     trackedService(0), cachedReference(0), cachedService(0), q_ptr(st)
 {
   this->customizer = customizer ? customizer : q_func();
   std::stringstream ss;
   ss << "(" << ServiceConstants::SERVICE_ID() << "="
      << any_cast<long>(reference.GetProperty(ServiceConstants::SERVICE_ID())) << ")";
   this->listenerFilter = ss.str();
   try
   {
     this->filter = LDAPFilter(listenerFilter);
   }
   catch (const std::invalid_argument& e)
   {
     /*
      * we could only get this exception if the ServiceReference was
      * invalid
      */
     std::invalid_argument ia(std::string("unexpected std::invalid_argument exception: ") + e.what());
     throw ia;
   }
 }
 
 template<class S, class T>
 ServiceTrackerPrivate<S,T>::ServiceTrackerPrivate(
     ServiceTracker<S,T>* st,
     ModuleContext* context, const std::string& clazz,
     ServiceTrackerCustomizer<T>* customizer)
       : context(context), customizer(customizer), trackClass(clazz),
         trackReference(0), trackedService(0), cachedReference(0),
         cachedService(0), q_ptr(st)
 {
   this->customizer = customizer ? customizer : q_func();
   this->listenerFilter = std::string("(") + US_PREPEND_NAMESPACE(ServiceConstants)::OBJECTCLASS() + "="
                         + clazz + ")";
   try
   {
     this->filter = LDAPFilter(listenerFilter);
   }
   catch (const std::invalid_argument& e)
   {
     /*
      * we could only get this exception if the clazz argument was
      * malformed
      */
     std::invalid_argument ia(
         std::string("unexpected std::invalid_argument exception: ") + e.what());
     throw ia;
   }
 }
 
 template<class S, class T>
 ServiceTrackerPrivate<S,T>::ServiceTrackerPrivate(
     ServiceTracker<S,T>* st,
     ModuleContext* context, const LDAPFilter& filter,
     ServiceTrackerCustomizer<T>* customizer)
       : context(context), filter(filter), customizer(customizer),
         listenerFilter(filter.ToString()), trackReference(0),
         trackedService(0), cachedReference(0), cachedService(0), q_ptr(st)
 {
   this->customizer = customizer ? customizer : q_func();
   if (context == 0)
   {
     throw std::invalid_argument("The module context cannot be null.");
   }
 }
 
 template<class S, class T>
 ServiceTrackerPrivate<S,T>::~ServiceTrackerPrivate()
 {
 
 }
 
 template<class S, class T>
 std::list<ServiceReference> ServiceTrackerPrivate<S,T>::GetInitialReferences(
   const std::string& className, const std::string& filterString)
 {
   return context->GetServiceReferences(className, filterString);
 }
 
 template<class S, class T>
 void ServiceTrackerPrivate<S,T>::GetServiceReferences_unlocked(std::list<ServiceReference>& refs, TrackedService<S,T>* t) const
 {
   if (t->Size() == 0)
   {
     return;
   }
   t->GetTracked(refs);
 }
 
 template<class S, class T>
 TrackedService<S,T>* ServiceTrackerPrivate<S,T>::Tracked() const
 {
   return trackedService;
 }
 
 template<class S, class T>
 void ServiceTrackerPrivate<S,T>::Modified()
 {
   cachedReference = 0; /* clear cached value */
   cachedService = 0; /* clear cached value */
   US_DEBUG(DEBUG) << "ServiceTracker::Modified(): " << filter;
 }
 
 US_END_NAMESPACE
diff --git a/Core/Code/CppMicroServices/src/service/usTrackedServiceListener.h b/Core/Code/CppMicroServices/src/service/usTrackedServiceListener_p.h
similarity index 100%
rename from Core/Code/CppMicroServices/src/service/usTrackedServiceListener.h
rename to Core/Code/CppMicroServices/src/service/usTrackedServiceListener_p.h
diff --git a/Core/Code/CppMicroServices/src/service/usTrackedService.h b/Core/Code/CppMicroServices/src/service/usTrackedService_p.h
similarity index 97%
rename from Core/Code/CppMicroServices/src/service/usTrackedService.h
rename to Core/Code/CppMicroServices/src/service/usTrackedService_p.h
index fc63cc6a06..41295a1c68 100644
--- a/Core/Code/CppMicroServices/src/service/usTrackedService.h
+++ b/Core/Code/CppMicroServices/src/service/usTrackedService_p.h
@@ -1,107 +1,107 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #ifndef USTRACKEDSERVICE_H
 #define USTRACKEDSERVICE_H
 
-#include "usTrackedServiceListener.h"
-#include "usModuleAbstractTracked.h"
+#include "usTrackedServiceListener_p.h"
+#include "usModuleAbstractTracked_p.h"
 #include "usServiceEvent.h"
 
 US_BEGIN_NAMESPACE
 
 /**
  * This class is not intended to be used directly. It is exported to support
  * the US module system.
  */
 template<class S, class T>
 class TrackedService : public TrackedServiceListener,
     public ModuleAbstractTracked<ServiceReference, T, ServiceEvent>
 {
 
 public:
   TrackedService(ServiceTracker<S,T>* serviceTracker,
                     ServiceTrackerCustomizer<T>* customizer);
 
   /**
    * Method connected to service events for the
    * <code>ServiceTracker</code> class. This method must NOT be
    * synchronized to avoid deadlock potential.
    *
    * @param event <code>ServiceEvent</code> object from the framework.
    */
   void ServiceChanged(const ServiceEvent event);
 
 private:
 
   typedef ModuleAbstractTracked<ServiceReference, T, ServiceEvent> Superclass;
 
   ServiceTracker<S,T>* serviceTracker;
   ServiceTrackerCustomizer<T>* customizer;
 
   /**
    * Increment the tracking count and tell the tracker there was a
    * modification.
    *
    * @GuardedBy this
    */
   void Modified();
 
   /**
    * Call the specific customizer adding method. This method must not be
    * called while synchronized on this object.
    *
    * @param item Item to be tracked.
    * @param related Action related object.
    * @return Customized object for the tracked item or <code>null</code>
    *         if the item is not to be tracked.
    */
   T CustomizerAdding(ServiceReference item, const ServiceEvent& related);
 
   /**
    * Call the specific customizer modified method. This method must not be
    * called while synchronized on this object.
    *
    * @param item Tracked item.
    * @param related Action related object.
    * @param object Customized object for the tracked item.
    */
   void CustomizerModified(ServiceReference item,
                           const ServiceEvent& related, T object) ;
 
   /**
    * Call the specific customizer removed method. This method must not be
    * called while synchronized on this object.
    *
    * @param item Tracked item.
    * @param related Action related object.
    * @param object Customized object for the tracked item.
    */
   void CustomizerRemoved(ServiceReference item,
                          const ServiceEvent& related, T object) ;
 };
 
 US_END_NAMESPACE
 
 #include "usTrackedService.tpp"
 
 #endif // USTRACKEDSERVICE_H
diff --git a/Core/Code/CppMicroServices/src/util/usAny.cpp b/Core/Code/CppMicroServices/src/util/usAny.cpp
index 6b9b08d7bf..fbfd8eb1ab 100644
--- a/Core/Code/CppMicroServices/src/util/usAny.cpp
+++ b/Core/Code/CppMicroServices/src/util/usAny.cpp
@@ -1,55 +1,56 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 #include "usAny.h"
 
 US_BEGIN_NAMESPACE
 
 template<typename Iterator>
 std::string container_to_string(Iterator i1, Iterator i2)
 {
   std::stringstream ss;
   ss << "(";
   const Iterator begin = i1;
   for ( ; i1 != i2; ++i1)
   {
     if (i1 == begin) ss << *i1;
     else ss << "," << *i1;
   }
+  ss << ")";
   return ss.str();
 }
 
 std::string any_value_to_string(const std::vector<std::string>& val)
 {
   return container_to_string(val.begin(), val.end());
 }
 
 std::string any_value_to_string(const std::list<std::string>& val)
 {
   return container_to_string(val.begin(), val.end());
 }
 
 std::string any_value_to_string(const std::vector<Any>& val)
 {
   return container_to_string(val.begin(), val.end());
 }
 
 US_END_NAMESPACE
diff --git a/Core/Code/CppMicroServices/src/util/usAny.h b/Core/Code/CppMicroServices/src/util/usAny.h
index 5c946d670c..82d691e099 100644
--- a/Core/Code/CppMicroServices/src/util/usAny.h
+++ b/Core/Code/CppMicroServices/src/util/usAny.h
@@ -1,398 +1,400 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
 
 Copyright Kevlin Henney, 2000, 2001, 2002. All rights reserved.
 Extracted from Boost 1.46.1 and adapted for CppMicroServices.
 
 Permission is hereby granted, free of charge, to any person or organization
 obtaining a copy of the software and accompanying documentation covered by
 this license (the "Software") to use, reproduce, display, distribute,
 execute, and transmit the Software, and to prepare derivative works of the
 Software, and to permit third-parties to whom the Software is furnished to
 do so, all subject to the following:
 
 The copyright notices in the Software and this entire statement, including
 the above license grant, this restriction and the following disclaimer,
 must be included in all copies of the Software, in whole or in part, and
 all derivative works of the Software, unless such copies or derivative
 works are solely in the form of machine-executable object code generated by
 a source language processor.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
 SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
 FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 
 =========================================================================*/
 
 #ifndef US_ANY_H
 #define US_ANY_H
 
 #include <algorithm>
 #include <typeinfo>
 #include <sstream>
 #include <vector>
 #include <list>
 
-#include <usExportMacros.h>
+#include <usConfig.h>
 
 US_BEGIN_NAMESPACE
 
 template<class T>
 std::string any_value_to_string(const T& val);
 
 US_EXPORT std::string any_value_to_string(const std::vector<std::string>& val);
 US_EXPORT std::string any_value_to_string(const std::list<std::string>& val);
 
 /**
+ * \ingroup MicroServicesUtils
+ *
  * An Any class represents a general type and is capable of storing any type, supporting type-safe extraction
  * of the internally stored data.
  *
  * Code taken from the Boost 1.46.1 library. Original copyright by Kevlin Henney. Modified for US.
  */
 class Any
 {
 public:
 
   /**
    * Creates an empty any type.
    */
   Any(): _content(0)
   { }
 
   /**
    * Creates an Any which stores the init parameter inside.
    *
    * \param value The content of the Any
    *
    * Example:
    * \code
    * Any a(13);
    * Any a(string("12345"));
    * \endcode
    */
   template <typename ValueType>
   Any(const ValueType& value)
     : _content(new Holder<ValueType>(value))
   { }
 
   /**
    * Copy constructor, works with empty Anys and initialized Any values.
    *
    * \param other The Any to copy
    */
   Any(const Any& other)
     : _content(other._content ? other._content->Clone() : 0)
   { }
 
   ~Any()
   {
     delete _content;
   }
 
   /**
    * Swaps the content of the two Anys.
    *
    * \param rhs The Any to swap this Any with.
    */
   Any& Swap(Any& rhs)
   {
     std::swap(_content, rhs._content);
     return *this;
   }
 
   /**
    * Assignment operator for all types != Any.
    *
    * \param rhs The value which should be assigned to this Any.
    *
    * Example:
    * \code
    * Any a = 13;
    * Any a = string("12345");
    * \endcode
    */
   template <typename ValueType>
   Any& operator = (const ValueType& rhs)
   {
     Any(rhs).Swap(*this);
     return *this;
   }
 
   /**
    * Assignment operator for Any.
    *
    * \param rhs The Any which should be assigned to this Any.
    */
   Any& operator = (const Any& rhs)
   {
     Any(rhs).Swap(*this);
     return *this;
   }
 
   /**
    * returns true if the Any is empty
    */
   bool Empty() const
   {
     return !_content;
   }
 
   /**
    * Returns a string representation for the content.
    *
    * Custom types should either provide a <code>std::ostream& operator<<(std::ostream& os, const CustomType& ct)</code>
    * function or specialize the any_value_to_string template function for meaningful output.
    */
   std::string ToString() const
   {
     return _content->ToString();
   }
 
   /**
    * Returns the type information of the stored content.
    * If the Any is empty typeid(void) is returned.
    * It is suggested to always query an Any for its type info before trying to extract
    * data via an any_cast/ref_any_cast.
    */
   const std::type_info& Type() const
   {
     return _content ? _content->Type() : typeid(void);
   }
 
 private:
 
   class Placeholder
   {
   public:
     virtual ~Placeholder()
     { }
 
     virtual std::string ToString() const = 0;
 
     virtual const std::type_info& Type() const = 0;
     virtual Placeholder* Clone() const = 0;
   };
 
   template <typename ValueType>
   class Holder: public Placeholder
   {
   public:
     Holder(const ValueType& value)
       : _held(value)
     { }
 
     virtual std::string ToString() const
     {
       return any_value_to_string(_held);
     }
 
     virtual const std::type_info& Type() const
     {
       return typeid(ValueType);
     }
 
     virtual Placeholder* Clone() const
     {
       return new Holder(_held);
     }
 
     ValueType _held;
 
   private: // intentionally left unimplemented
     Holder& operator=(const Holder &);
   };
 
 private:
     template <typename ValueType>
     friend ValueType* any_cast(Any*);
 
     template <typename ValueType>
     friend ValueType* unsafe_any_cast(Any*);
 
     Placeholder* _content;
 };
 
 class BadAnyCastException : public std::bad_cast
 {
 public:
 
   BadAnyCastException(const std::string& msg = "")
     : std::bad_cast(), _msg(msg)
   {}
 
   ~BadAnyCastException() throw() {}
 
   virtual const char * what() const throw()
   {
     if (_msg.empty())
       return "US_PREPEND_NAMESPACE(BadAnyCastException): "
              "failed conversion using US_PREPEND_NAMESPACE(any_cast)";
     else
       return _msg.c_str();
   }
 
 private:
 
   std::string _msg;
 };
 
 /**
  * any_cast operator used to extract the ValueType from an Any*. Will return a pointer
  * to the stored value.
  *
  * Example Usage:
  * \code
  * MyType* pTmp = any_cast<MyType*>(pAny)
  * \endcode
  * Will return NULL if the cast fails, i.e. types don't match.
  */
 template <typename ValueType>
 ValueType* any_cast(Any* operand)
 {
   return operand && operand->Type() == typeid(ValueType)
       ? &static_cast<Any::Holder<ValueType>*>(operand->_content)->_held
       : 0;
 }
 
 /**
  * any_cast operator used to extract a const ValueType pointer from an const Any*. Will return a const pointer
  * to the stored value.
  *
  * Example Usage:
  * \code
  * const MyType* pTmp = any_cast<MyType*>(pAny)
  * \endcode
  * Will return NULL if the cast fails, i.e. types don't match.
  */
 template <typename ValueType>
 const ValueType* any_cast(const Any* operand)
 {
   return any_cast<ValueType>(const_cast<Any*>(operand));
 }
 
 /**
  * any_cast operator used to extract a copy of the ValueType from an const Any&.
  *
  * Example Usage:
  * \code
  * MyType tmp = any_cast<MyType>(anAny)
  * \endcode
  * Will throw a BadCastException if the cast fails.
  * Dont use an any_cast in combination with references, i.e. MyType& tmp = ... or const MyType& = ...
  * Some compilers will accept this code although a copy is returned. Use the ref_any_cast in
  * these cases.
  */
 template <typename ValueType>
 ValueType any_cast(const Any& operand)
 {
   ValueType* result = any_cast<ValueType>(const_cast<Any*>(&operand));
   if (!result) throw BadAnyCastException("Failed to convert between const Any types");
   return *result;
 }
 
 /**
  * any_cast operator used to extract a copy of the ValueType from an Any&.
  *
  * Example Usage:
  * \code
  * MyType tmp = any_cast<MyType>(anAny)
  * \endcode
  * Will throw a BadCastException if the cast fails.
  * Dont use an any_cast in combination with references, i.e. MyType& tmp = ... or const MyType& tmp = ...
  * Some compilers will accept this code although a copy is returned. Use the ref_any_cast in
  * these cases.
  */
 template <typename ValueType>
 ValueType any_cast(Any& operand)
 {
   ValueType* result = any_cast<ValueType>(&operand);
   if (!result) throw BadAnyCastException("Failed to convert between Any types");
   return *result;
 }
 
 /**
  * ref_any_cast operator used to return a const reference to the internal data.
  *
  * Example Usage:
  * \code
  * const MyType& tmp = ref_any_cast<MyType>(anAny);
  * \endcode
  */
 template <typename ValueType>
 const ValueType& ref_any_cast(const Any & operand)
 {
   ValueType* result = any_cast<ValueType>(const_cast<Any*>(&operand));
   if (!result) throw BadAnyCastException("RefAnyCast: Failed to convert between const Any types");
   return *result;
 }
 
 /**
  * ref_any_cast operator used to return a reference to the internal data.
  *
  * Example Usage:
  * \code
  * MyType& tmp = ref_any_cast<MyType>(anAny);
  * \endcode
  */
 template <typename ValueType>
 ValueType& ref_any_cast(Any& operand)
 {
   ValueType* result = any_cast<ValueType>(&operand);
   if (!result) throw BadAnyCastException("RefAnyCast: Failed to convert between Any types");
   return *result;
 }
 
 /**
  * \internal
  *
  * The "unsafe" versions of any_cast are not part of the
  * public interface and may be removed at any time. They are
  * required where we know what type is stored in the any and can't
  * use typeid() comparison, e.g., when our types may travel across
  * different shared libraries.
  */
 template <typename ValueType>
 ValueType* unsafe_any_cast(Any* operand)
 {
   return &static_cast<Any::Holder<ValueType>*>(operand->_content)->_held;
 }
 
 /**
  * \internal
  *
  * The "unsafe" versions of any_cast are not part of the
  * public interface and may be removed at any time. They are
  * required where we know what type is stored in the any and can't
  * use typeid() comparison, e.g., when our types may travel across
  * different shared libraries.
  */
 template <typename ValueType>
 const ValueType* unsafe_any_cast(const Any* operand)
 {
   return any_cast<ValueType>(const_cast<Any*>(operand));
 }
 
 US_EXPORT std::string any_value_to_string(const std::vector<Any>& val);
 
 template<class T>
 std::string any_value_to_string(const T& val)
 {
   std::stringstream ss;
   ss << val;
   return ss.str();
 }
 
 US_END_NAMESPACE
 
 inline std::ostream& operator<< (std::ostream& os, const US_PREPEND_NAMESPACE(Any)& any)
 {
   return os << any.ToString();
 }
 
 #endif // US_ANY_H
diff --git a/Core/Code/CppMicroServices/src/util/usAtomicInt.h b/Core/Code/CppMicroServices/src/util/usAtomicInt_p.h
similarity index 98%
rename from Core/Code/CppMicroServices/src/util/usAtomicInt.h
rename to Core/Code/CppMicroServices/src/util/usAtomicInt_p.h
index 3ed5c2859a..4bc954ec02 100644
--- a/Core/Code/CppMicroServices/src/util/usAtomicInt.h
+++ b/Core/Code/CppMicroServices/src/util/usAtomicInt_p.h
@@ -1,83 +1,83 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #ifndef USATOMICINT_H
 #define USATOMICINT_H
 
 #include <usConfig.h>
-#include "usThreads.h"
+#include "usThreads_p.h"
 
 US_BEGIN_NAMESPACE
 
 /**
  * This class acts as an atomic integer.
  *
  * The integer value represented by this class can be incremented
  * and decremented atomically. This is often useful in reference
  * counting scenarios to minimize locking overhead in multi-threaded
  * environments.
  */
 class AtomicInt : private US_DEFAULT_THREADING<AtomicInt>
 {
 
 public:
 
   AtomicInt(int value = 0) : m_ReferenceCount(value) {}
 
   /**
    * Increase the reference count atomically by 1.
    *
    * \return <code>true</code> if the new value is unequal to zero, <code>false</code>
    *         otherwise.
    */
   inline bool Ref() const
   { return AtomicIncrement(m_ReferenceCount) != 0; }
 
   /**
    * Decrease the reference count atomically by 1.
    *
    * \return <code>true</code> if the new value is unequal to zero, <code>false</code>
    *         otherwise.
    */
   inline bool Deref() const
   { return AtomicDecrement(m_ReferenceCount) != 0; }
 
   /**
    * Returns the current value.
    *
    */
   inline operator int() const
   {
     IntType curr(0);
     AtomicAssign(curr, m_ReferenceCount);
     return curr;
   }
 
 private:
 
   mutable IntType m_ReferenceCount;
 
 };
 
 US_END_NAMESPACE
 
 #endif // USATOMICINT_H
diff --git a/Core/Code/CppMicroServices/src/util/usExportMacros.h b/Core/Code/CppMicroServices/src/util/usExportMacros.h
deleted file mode 100644
index f9a7f7adce..0000000000
--- a/Core/Code/CppMicroServices/src/util/usExportMacros.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*=============================================================================
-
-  Library: CppMicroServices
-
-  Copyright (c) German Cancer Research Center,
-    Division of Medical and Biological Informatics
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-=============================================================================*/
-
-
-#ifndef USEXPORTMACROS_H
-#define USEXPORTMACROS_H
-
-#include <usConfig.h>
-
-/**
-  * Macros for import/export declarations
-  */
-#if defined(WIN32)
-  #define US_ABI_EXPORT __declspec(dllexport)
-  #define US_ABI_IMPORT __declspec(dllimport)
-  #define US_ABI_LOCAL
-#else
-  #if __GNUC__ >= 4
-    #define US_ABI_EXPORT __attribute__ ((visibility ("default")))
-    #define US_ABI_IMPORT __attribute__ ((visibility ("default")))
-    #define US_ABI_LOCAL  __attribute__ ((visibility ("hidden")))
-  #else
-    #define US_ABI_EXPORT
-    #define US_ABI_IMPORT
-    #define US_ABI_LOCAL
-  #endif
-#endif
-
-#ifdef US_BUILD_SHARED_LIBS
-  // We are building a shared lib
-  #ifdef CppMicroServices_EXPORTS
-    #define US_EXPORT US_ABI_EXPORT
-  #else
-    #define US_EXPORT US_ABI_IMPORT
-  #endif
-#else
-  // We are building a static lib
-  #if __GNUC__ >= 4
-    // Don't hide RTTI symbols of definitions in the C++ Micro Services
-    // headers that are included in DSOs with hidden visibility
-    #define US_EXPORT US_ABI_EXPORT
-  #else
-    #define US_EXPORT
-  #endif
-#endif
-
-#endif // USEXPORTMACROS_H
diff --git a/Core/Code/CppMicroServices/src/util/usFunctor.h b/Core/Code/CppMicroServices/src/util/usFunctor_p.h
similarity index 100%
rename from Core/Code/CppMicroServices/src/util/usFunctor.h
rename to Core/Code/CppMicroServices/src/util/usFunctor_p.h
diff --git a/Core/Code/CppMicroServices/src/util/usSharedData.h b/Core/Code/CppMicroServices/src/util/usSharedData.h
index dfca6fb58b..f3a6dfc82f 100644
--- a/Core/Code/CppMicroServices/src/util/usSharedData.h
+++ b/Core/Code/CppMicroServices/src/util/usSharedData.h
@@ -1,267 +1,274 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 
 Modified version of qshareddata.h from Qt 4.7.3 for CppMicroServices.
 Original copyright (c) Nokia Corporation. Usage covered by the
 GNU Lesser General Public License version 2.1
 (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html) and the Nokia Qt
 LGPL Exception version 1.1 (file LGPL_EXCEPTION.txt in Qt 4.7.3 package).
 
 =========================================================================*/
 
 #ifndef USSHAREDDATA_H
 #define USSHAREDDATA_H
 
-#include "usAtomicInt.h"
+#include "usAtomicInt_p.h"
 
 #include <algorithm>
 #include <utility>
 
-#include <usExportMacros.h>
-
 US_BEGIN_NAMESPACE
 
+/**
+ * \ingroup MicroServicesUtils
+ */
 class SharedData
 {
 public:
   mutable AtomicInt ref;
 
   inline SharedData() : ref(0) { }
   inline SharedData(const SharedData&) : ref(0) { }
 
 private:
   // using the assignment operator would lead to corruption in the ref-counting
   SharedData& operator=(const SharedData&);
 };
 
+/**
+ * \ingroup MicroServicesUtils
+ */
 template <class T>
 class SharedDataPointer
 {
 public:
   typedef T Type;
   typedef T* pointer;
 
   inline void Detach() { if (d && d->ref != 1) Detach_helper(); }
   inline T& operator*() { Detach(); return *d; }
   inline const T& operator*() const { return *d; }
   inline T* operator->() { Detach(); return d; }
   inline const T* operator->() const { return d; }
   inline operator T*() { Detach(); return d; }
   inline operator const T*() const { return d; }
   inline T* Data() { Detach(); return d; }
   inline const T* Data() const { return d; }
   inline const T* ConstData() const { return d; }
 
   inline bool operator==(const SharedDataPointer<T>& other) const { return d == other.d; }
   inline bool operator!=(const SharedDataPointer<T>& other) const { return d != other.d; }
 
   inline SharedDataPointer() : d(0) { }
   inline ~SharedDataPointer() { if (d && !d->ref.Deref()) delete d; }
 
   explicit SharedDataPointer(T* data);
   inline SharedDataPointer(const SharedDataPointer<T>& o) : d(o.d) { if (d) d->ref.Ref(); }
 
   inline SharedDataPointer<T> & operator=(const SharedDataPointer<T>& o)
   {
     if (o.d != d)
     {
       if (o.d)
         o.d->ref.Ref();
       T *old = d;
       d = o.d;
       if (old && !old->ref.Deref())
         delete old;
     }
     return *this;
   }
 
   inline SharedDataPointer &operator=(T *o)
   {
     if (o != d)
     {
       if (o)
         o->ref.Ref();
       T *old = d;
       d = o;
       if (old && !old->ref.Deref())
         delete old;
     }
     return *this;
   }
 
   inline bool operator!() const { return !d; }
 
   inline void Swap(SharedDataPointer& other)
   {
     using std::swap;
     swap(d, other.d);
   }
 
 protected:
   T* Clone();
 
 private:
   void Detach_helper();
 
   T *d;
 };
 
+/**
+ * \ingroup MicroServicesUtils
+ */
 template <class T> class ExplicitlySharedDataPointer
 {
 public:
   typedef T Type;
   typedef T* pointer;
 
   inline T& operator*() const { return *d; }
   inline T* operator->() { return d; }
   inline T* operator->() const { return d; }
   inline T* Data() const { return d; }
   inline const T* ConstData() const { return d; }
 
   inline void Detach() { if (d && d->ref != 1) Detach_helper(); }
 
   inline void Reset()
   {
     if(d && !d->ref.Deref())
       delete d;
 
     d = 0;
   }
 
   inline operator bool () const { return d != 0; }
 
   inline bool operator==(const ExplicitlySharedDataPointer<T>& other) const { return d == other.d; }
   inline bool operator!=(const ExplicitlySharedDataPointer<T>& other) const { return d != other.d; }
   inline bool operator==(const T* ptr) const { return d == ptr; }
   inline bool operator!=(const T* ptr) const { return d != ptr; }
 
   inline ExplicitlySharedDataPointer() { d = 0; }
   inline ~ExplicitlySharedDataPointer() { if (d && !d->ref.Deref()) delete d; }
 
   explicit ExplicitlySharedDataPointer(T* data);
   inline ExplicitlySharedDataPointer(const ExplicitlySharedDataPointer<T> &o)
     : d(o.d) { if (d) d->ref.Ref(); }
 
   template<class X>
   inline ExplicitlySharedDataPointer(const ExplicitlySharedDataPointer<X>& o)
     : d(static_cast<T*>(o.Data()))
   {
     if(d)
       d->ref.Ref();
   }
 
   inline ExplicitlySharedDataPointer<T>& operator=(const ExplicitlySharedDataPointer<T>& o)
   {
     if (o.d != d)
     {
       if (o.d)
         o.d->ref.Ref();
       T *old = d;
       d = o.d;
       if (old && !old->ref.Deref())
         delete old;
     }
     return *this;
   }
 
   inline ExplicitlySharedDataPointer& operator=(T* o)
   {
     if (o != d)
     {
       if (o)
         o->ref.Ref();
       T *old = d;
       d = o;
       if (old && !old->ref.Deref())
         delete old;
     }
     return *this;
   }
 
   inline bool operator!() const { return !d; }
 
   inline void Swap(ExplicitlySharedDataPointer& other)
   {
     using std::swap;
     swap(d, other.d);
   }
 
 protected:
   T* Clone();
 
 private:
   void Detach_helper();
 
   T *d;
 };
 
 
 template <class T>
 SharedDataPointer<T>::SharedDataPointer(T* adata) : d(adata)
 { if (d) d->ref.Ref(); }
 
 template <class T>
 T* SharedDataPointer<T>::Clone()
 {
   return new T(*d);
 }
 
 template <class T>
 void SharedDataPointer<T>::Detach_helper()
 {
   T *x = Clone();
   x->ref.Ref();
   if (!d->ref.Deref())
     delete d;
   d = x;
 }
 
 template <class T>
 T* ExplicitlySharedDataPointer<T>::Clone()
 {
   return new T(*d);
 }
 
 template <class T>
 void ExplicitlySharedDataPointer<T>::Detach_helper()
 {
   T *x = Clone();
     x->ref.Ref();
   if (!d->ref.Deref())
     delete d;
   d = x;
 }
 
 template <class T>
 ExplicitlySharedDataPointer<T>::ExplicitlySharedDataPointer(T* adata)
   : d(adata)
 { if (d) d->ref.Ref(); }
 
 template <class T>
 void swap(US_PREPEND_NAMESPACE(SharedDataPointer<T)>& p1, US_PREPEND_NAMESPACE(SharedDataPointer<T)>& p2)
 { p1.Swap(p2); }
 
 template <class T>
 void swap(US_PREPEND_NAMESPACE(ExplicitlySharedDataPointer<T)>& p1, US_PREPEND_NAMESPACE(ExplicitlySharedDataPointer<T)>& p2)
 { p1.Swap(p2); }
 
 US_END_NAMESPACE
 
 #endif // USSHAREDDATA_H
diff --git a/Core/Code/CppMicroServices/src/util/usStaticInit.h b/Core/Code/CppMicroServices/src/util/usStaticInit_p.h
similarity index 99%
rename from Core/Code/CppMicroServices/src/util/usStaticInit.h
rename to Core/Code/CppMicroServices/src/util/usStaticInit_p.h
index f639104efb..b69d45c61d 100644
--- a/Core/Code/CppMicroServices/src/util/usStaticInit.h
+++ b/Core/Code/CppMicroServices/src/util/usStaticInit_p.h
@@ -1,166 +1,166 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 
 Extracted from qglobal.h from Qt 4.7.3 and adapted for CppMicroServices.
 Original copyright (c) Nokia Corporation. Usage covered by the
 GNU Lesser General Public License version 2.1
 (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html) and the Nokia Qt
 LGPL Exception version 1.1 (file LGPL_EXCEPTION.txt in Qt 4.7.3 package).
 
 =========================================================================*/
 
 #ifndef US_STATIC_INIT_H
 #define US_STATIC_INIT_H
 
 #include <usConfig.h>
-#include "usThreads.h"
+#include "usThreads_p.h"
 
 US_BEGIN_NAMESPACE
 
 // POD for US_GLOBAL_STATIC
 template <typename T>
 class GlobalStatic : public US_DEFAULT_THREADING<GlobalStatic<T> >
 {
 public:
 
   GlobalStatic(T* p = 0, bool destroyed = false) : pointer(p), destroyed(destroyed) {}
 
   T* pointer;
   bool destroyed;
 
 private:
 
   // purposely not implemented
   GlobalStatic(const GlobalStatic&);
   GlobalStatic& operator=(const GlobalStatic&);
 };
 
 template<typename T>
 struct DefaultGlobalStaticDeleter
 {
   void operator()(GlobalStatic<T>& globalStatic) const
   {
     delete globalStatic.pointer;
     globalStatic.pointer = 0;
     globalStatic.destroyed = true;
   }
 };
 
 // Created as a function-local static to delete a GlobalStatic<T>
 template <typename T, template<typename T_> class Deleter = DefaultGlobalStaticDeleter>
 class GlobalStaticDeleter
 {
 public:
   GlobalStatic<T> &globalStatic;
 
   GlobalStaticDeleter(GlobalStatic<T> &_globalStatic)
     : globalStatic(_globalStatic)
   { }
 
   inline ~GlobalStaticDeleter()
   {
     Deleter<T> deleter;
     deleter(globalStatic);
   }
 };
 
 US_END_NAMESPACE
 
 
 #define US_GLOBAL_STATIC_INIT(TYPE, NAME)                                \
   static US_PREPEND_NAMESPACE(GlobalStatic)<TYPE>& this_##NAME()         \
   {                                                                      \
     static US_PREPEND_NAMESPACE(GlobalStatic)<TYPE> l;                   \
     return l;                                                            \
   }
 
 #define US_GLOBAL_STATIC(TYPE, NAME)                                     \
   US_GLOBAL_STATIC_INIT(TYPE, NAME)                                      \
   static TYPE *NAME()                                                    \
   {                                                                      \
     if (!this_##NAME().pointer && !this_##NAME().destroyed)              \
     {                                                                    \
       TYPE *x = new TYPE;                                                \
       bool ok = false;                                                   \
       {                                                                  \
         US_PREPEND_NAMESPACE(GlobalStatic)<TYPE>::Lock lock(this_##NAME()); \
         if (!this_##NAME().pointer)                                      \
         {                                                                \
           this_##NAME().pointer = x;                                     \
           ok = true;                                                     \
         }                                                                \
       }                                                                  \
       if (!ok)                                                           \
         delete x;                                                        \
       else                                                               \
         static US_PREPEND_NAMESPACE(GlobalStaticDeleter)<TYPE> cleanup(this_##NAME()); \
     }                                                                    \
     return this_##NAME().pointer;                                        \
   }
 
 #define US_GLOBAL_STATIC_WITH_DELETER(TYPE, NAME, DELETER)               \
   US_GLOBAL_STATIC_INIT(TYPE, NAME)                                      \
   static TYPE *NAME()                                                    \
   {                                                                      \
     if (!this_##NAME().pointer && !this_##NAME().destroyed)              \
     {                                                                    \
       TYPE *x = new TYPE;                                                \
       bool ok = false;                                                   \
       {                                                                  \
         US_PREPEND_NAMESPACE(GlobalStatic)<TYPE>::Lock lock(this_##NAME()); \
         if (!this_##NAME().pointer)                                      \
         {                                                                \
           this_##NAME().pointer = x;                                     \
           ok = true;                                                     \
         }                                                                \
       }                                                                  \
       if (!ok)                                                           \
         delete x;                                                        \
       else                                                               \
         static US_PREPEND_NAMESPACE(GlobalStaticDeleter)<TYPE, DELETER > cleanup(this_##NAME()); \
     }                                                                    \
     return this_##NAME().pointer;                                        \
   }
 
 #define US_GLOBAL_STATIC_WITH_ARGS(TYPE, NAME, ARGS)                     \
   US_GLOBAL_STATIC_INIT(TYPE, NAME)                                      \
   static TYPE *NAME()                                                    \
   {                                                                      \
     if (!this_##NAME().pointer && !this_##NAME().destroyed)              \
     {                                                                    \
       TYPE *x = new TYPE ARGS;                                           \
       bool ok = false;                                                   \
       {                                                                  \
         US_PREPEND_NAMESPACE(GlobalStatic)<TYPE>::Lock lock(this_##NAME()); \
         if (!this_##NAME().pointer)                                      \
         {                                                                \
           this_##NAME().pointer = x;                                     \
           ok = true;                                                     \
         }                                                                \
       }                                                                  \
       if (!ok)                                                           \
         delete x;                                                        \
       else                                                               \
         static US_PREPEND_NAMESPACE(GlobalStaticDeleter)<TYPE> cleanup(this_##NAME()); \
     }                                                                    \
     return this_##NAME().pointer;                                        \
   }
 
 #endif // US_STATIC_INIT_H
diff --git a/Core/Code/CppMicroServices/src/util/usThreads.cpp b/Core/Code/CppMicroServices/src/util/usThreads.cpp
index 5ce01ae03d..f26bc0c023 100644
--- a/Core/Code/CppMicroServices/src/util/usThreads.cpp
+++ b/Core/Code/CppMicroServices/src/util/usThreads.cpp
@@ -1,255 +1,255 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
-#include "usThreads.h"
+#include "usThreads_p.h"
 
-#include "usUtils.h"
+#include "usUtils_p.h"
 
 #ifdef US_PLATFORM_POSIX
 #include <sys/time.h>
 #include <errno.h>
 #endif
 
 US_BEGIN_NAMESPACE
 
 WaitCondition::WaitCondition()
 {
 #ifdef US_ENABLE_THREADING_SUPPORT
   #ifdef US_PLATFORM_POSIX
     pthread_cond_init(&m_WaitCondition, 0);
   #else
     m_NumberOfWaiters = 0;
     m_WasNotifyAll = 0;
     m_Semaphore = CreateSemaphore(0,            // no security
                                   0,            // initial value
                                   0x7fffffff,   // max count
                                   0);           // unnamed
     InitializeCriticalSection(&m_NumberOfWaitersLock);
     m_WaitersAreDone = CreateEvent(0,           // no security
                                    FALSE,       // auto-reset
                                    FALSE,       // non-signaled initially
                                    0 );         // unnamed
   #endif
 #endif
 }
 
 WaitCondition::~WaitCondition()
 {
 #ifdef US_ENABLE_THREADING_SUPPORT
   #ifdef US_PLATFORM_POSIX
     pthread_cond_destroy(&m_WaitCondition);
   #else
     CloseHandle(m_Semaphore);
     CloseHandle(m_WaitersAreDone);
     DeleteCriticalSection(&m_NumberOfWaitersLock);
   #endif
 #endif
 }
 
 void WaitCondition::Notify()
 {
 #ifdef US_ENABLE_THREADING_SUPPORT
   #ifdef US_PLATFORM_POSIX
     pthread_cond_signal(&m_WaitCondition);
   #else
     EnterCriticalSection(&m_NumberOfWaitersLock);
     int haveWaiters = m_NumberOfWaiters > 0;
     LeaveCriticalSection(&m_NumberOfWaitersLock);
 
     // if there were not any waiters, then this is a no-op
     if (haveWaiters)
     {
       ReleaseSemaphore(m_Semaphore, 1, 0);
     }
   #endif
 #endif
 }
 
 void WaitCondition::NotifyAll()
 {
 #ifdef US_ENABLE_THREADING_SUPPORT
   #ifdef US_PLATFORM_POSIX
     pthread_cond_broadcast(&m_WaitCondition);
   #else
     // This is needed to ensure that m_NumberOfWaiters and m_WasNotifyAll are
     // consistent
     EnterCriticalSection(&m_NumberOfWaitersLock);
     int haveWaiters = 0;
 
     if (m_NumberOfWaiters > 0)
     {
       // We are broadcasting, even if there is just one waiter...
       // Record that we are broadcasting, which helps optimize Notify()
       // for the non-broadcast case
       m_WasNotifyAll = 1;
       haveWaiters = 1;
     }
 
     if (haveWaiters)
     {
       // Wake up all waiters atomically
       ReleaseSemaphore(m_Semaphore, m_NumberOfWaiters, 0);
 
       LeaveCriticalSection(&m_NumberOfWaitersLock);
 
       // Wait for all the awakened threads to acquire the counting
       // semaphore
       WaitForSingleObject(m_WaitersAreDone, INFINITE);
       // This assignment is ok, even without the m_NumberOfWaitersLock held
       // because no other waiter threads can wake up to access it.
       m_WasNotifyAll = 0;
     }
     else
     {
       LeaveCriticalSection(&m_NumberOfWaitersLock);
     }
   #endif
 #endif
 }
 
 bool WaitCondition::Wait(MutexType* mutex, unsigned long timeoutMillis)
 {
   return Wait(*mutex, timeoutMillis);
 }
 
 #ifdef US_ENABLE_THREADING_SUPPORT
 bool WaitCondition::Wait(MutexType& mutex, unsigned long timeoutMillis)
 {
   #ifdef US_PLATFORM_POSIX
     struct timespec ts, * pts = 0;
     if (timeoutMillis)
     {
       pts = &ts;
       struct timeval tv;
       int error = gettimeofday(&tv, NULL);
       if (error)
       {
         US_ERROR << "gettimeofday error: " << GetLastErrorStr();
         return false;
       }
       ts.tv_sec = tv.tv_sec;
       ts.tv_nsec = tv.tv_usec * 1000;
       ts.tv_sec += timeoutMillis / 1000;
       ts.tv_nsec += (timeoutMillis % 1000) * 1000000;
       ts.tv_sec += ts.tv_nsec / 1000000000;
       ts.tv_nsec = ts.tv_nsec % 1000000000;
     }
 
     if (pts)
     {
       int error = pthread_cond_timedwait(&m_WaitCondition, &mutex.m_Mtx, pts);
       if (error == 0)
       {
         return true;
       }
       else
       {
         if (error != ETIMEDOUT)
         {
           US_ERROR << "pthread_cond_timedwait error: " << GetLastErrorStr();
         }
         return false;
       }
     }
     else
     {
       int error = pthread_cond_wait(&m_WaitCondition, &mutex.m_Mtx);
       if (error)
       {
         US_ERROR << "pthread_cond_wait error: " << GetLastErrorStr();
         return false;
       }
       return true;
     }
 
   #else
 
     // Avoid race conditions
     EnterCriticalSection(&m_NumberOfWaitersLock);
     m_NumberOfWaiters++;
     LeaveCriticalSection(&m_NumberOfWaitersLock);
 
     DWORD dw;
     bool result = true;
 
     // This call atomically releases the mutex and waits on the
     // semaphore until signaled
     dw = SignalObjectAndWait(mutex.m_Mtx, m_Semaphore, timeoutMillis ? timeoutMillis : INFINITE, FALSE);
     if (dw == WAIT_TIMEOUT)
     {
       result = false;
     }
     else if (dw == WAIT_FAILED)
     {
       result = false;
       US_ERROR << "SignalObjectAndWait failed: " << GetLastErrorStr();
     }
 
     // Reacquire lock to avoid race conditions
     EnterCriticalSection(&m_NumberOfWaitersLock);
 
     // We're no longer waiting....
     m_NumberOfWaiters--;
 
     // Check to see if we're the last waiter after the broadcast
     int lastWaiter = m_WasNotifyAll && m_NumberOfWaiters == 0;
 
     LeaveCriticalSection(&m_NumberOfWaitersLock);
 
     // If we're the last waiter thread during this particular broadcast
     // then let the other threads proceed
     if (lastWaiter)
     {
       // This call atomically signals the m_WaitersAreDone event and waits
       // until it can acquire the external mutex.  This is required to
       // ensure fairness
       dw = SignalObjectAndWait(m_WaitersAreDone, mutex.m_Mtx,
                           INFINITE, FALSE);
       if (result && dw == WAIT_FAILED)
       {
         result = false;
         US_ERROR << "SignalObjectAndWait failed: " << GetLastErrorStr();
       }
     }
     else
     {
       // Always regain the external mutex since that's the guarentee we
       // give to our callers
       dw = WaitForSingleObject(mutex.m_Mtx, INFINITE);
       if (result && dw == WAIT_FAILED)
       {
         result = false;
         US_ERROR << "SignalObjectAndWait failed: " << GetLastErrorStr();
       }
     }
 
     return result;
   #endif
 }
 #else
 bool WaitCondition::Wait(MutexType&, unsigned long)
 {
   return true;
 }
 #endif
 
 US_END_NAMESPACE
 
diff --git a/Core/Code/CppMicroServices/src/util/usThreads.h b/Core/Code/CppMicroServices/src/util/usThreads_p.h
similarity index 99%
rename from Core/Code/CppMicroServices/src/util/usThreads.h
rename to Core/Code/CppMicroServices/src/util/usThreads_p.h
index df96473022..8c77a24781 100644
--- a/Core/Code/CppMicroServices/src/util/usThreads.h
+++ b/Core/Code/CppMicroServices/src/util/usThreads_p.h
@@ -1,432 +1,430 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #ifndef USTHREADINGMODEL_H
 #define USTHREADINGMODEL_H
 
 #include <usConfig.h>
-#include "usExportMacros.h"
 
 #ifdef US_ENABLE_THREADING_SUPPORT
 
   // Atomic compiler intrinsics
 
   #if defined(US_PLATFORM_APPLE)
     // OSAtomic.h optimizations only used in 10.5 and later
     #include <AvailabilityMacros.h>
     #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
       #include <libkern/OSAtomic.h>
       #define US_ATOMIC_OPTIMIZATION_APPLE
     #endif
 
   #elif defined(__GLIBCPP__) || defined(__GLIBCXX__)
 
     #if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
       # include <ext/atomicity.h>
     #else
       # include <bits/atomicity.h>
     #endif
     #define US_ATOMIC_OPTIMIZATION_GNUC
 
   #endif
 
   // Mutex support
 
   #ifdef US_PLATFORM_WINDOWS
-
     #ifndef WIN32_LEAN_AND_MEAN
       #define WIN32_LEAN_AND_MEAN
     #endif
     #ifndef NOMINMAX
       #define NOMINMAX
     #endif
     #include <windows.h>
 
     #define US_THREADS_MUTEX(x)           HANDLE (x);
     #define US_THREADS_MUTEX_INIT(x)
     #define US_THREADS_MUTEX_CTOR(x)      : x(::CreateMutex(NULL, FALSE, NULL))
     #define US_THREADS_MUTEX_DELETE(x)    ::CloseHandle (x)
     #define US_THREADS_MUTEX_LOCK(x)      ::WaitForSingleObject (x, INFINITE)
     #define US_THREADS_MUTEX_UNLOCK(x)    ::ReleaseMutex (x)
     #define US_THREADS_LONG               LONG
 
     #define US_ATOMIC_OPTIMIZATION
     #define US_ATOMIC_INCREMENT(x)        IntType n = InterlockedIncrement(x)
     #define US_ATOMIC_DECREMENT(x)        IntType n = InterlockedDecrement(x)
     #define US_ATOMIC_ASSIGN(l, r)        InterlockedExchange(l, r)
 
   #elif defined(US_PLATFORM_POSIX)
 
     #include <pthread.h>
 
     #define US_THREADS_MUTEX(x)           pthread_mutex_t (x);
     #define US_THREADS_MUTEX_INIT(x)      ::pthread_mutex_init(&x, 0)
     #define US_THREADS_MUTEX_CTOR(x)      : x()
     #define US_THREADS_MUTEX_DELETE(x)    ::pthread_mutex_destroy (&x)
     #define US_THREADS_MUTEX_LOCK(x)      ::pthread_mutex_lock (&x)
     #define US_THREADS_MUTEX_UNLOCK(x)    ::pthread_mutex_unlock (&x)
 
     #define US_ATOMIC_OPTIMIZATION
     #if defined(US_ATOMIC_OPTIMIZATION_APPLE)
       #if defined (__LP64__) && __LP64__
         #define US_THREADS_LONG           volatile int64_t
         #define US_ATOMIC_INCREMENT(x)    IntType n = OSAtomicIncrement64Barrier(x)
         #define US_ATOMIC_DECREMENT(x)    IntType n = OSAtomicDecrement64Barrier(x)
         #define US_ATOMIC_ASSIGN(l, v)    OSAtomicCompareAndSwap64Barrier(*l, v, l)
       #else
         #define US_THREADS_LONG           volatile int32_t
         #define US_ATOMIC_INCREMENT(x)    IntType n = OSAtomicIncrement32Barrier(x)
         #define US_ATOMIC_DECREMENT(x)    IntType n = OSAtomicDecrement32Barrier(x)
         #define US_ATOMIC_ASSIGN(l, v)    OSAtomicCompareAndSwap32Barrier(*l, v, l)
       #endif
     #elif defined(US_ATOMIC_OPTIMIZATION_GNUC)
       #define US_THREADS_LONG             _Atomic_word
       #define US_ATOMIC_INCREMENT(x)      IntType n = __sync_add_and_fetch(x, 1)
       #define US_ATOMIC_DECREMENT(x)      IntType n = __sync_add_and_fetch(x, -1)
       #define US_ATOMIC_ASSIGN(l, v)      __sync_val_compare_and_swap(l, *l, v)
     #else
       #define US_THREADS_LONG             long
       #undef US_ATOMIC_OPTIMIZATION
       #define US_ATOMIC_INCREMENT(x)      m_AtomicMtx.Lock();  \
                                           IntType n = ++(*x);  \
                                           m_AtomicMtx.Unlock()
       #define US_ATOMIC_DECREMENT(x)      m_AtomicMtx.Lock();  \
                                           IntType n = --(*x);  \
                                           m_AtomicMtx.Unlock()
       #define US_ATOMIC_ASSIGN(l, v)      m_AtomicMtx.Lock();  \
                                           *l = v;              \
                                           m_AtomicMtx.Unlock()
     #endif
 
   #endif
 
 #else
 
   // single threaded
   #define US_THREADS_MUTEX(x)
   #define US_THREADS_MUTEX_INIT(x)
   #define US_THREADS_MUTEX_CTOR(x)
   #define US_THREADS_MUTEX_DELETE(x)
   #define US_THREADS_MUTEX_LOCK(x)
   #define US_THREADS_MUTEX_UNLOCK(x)
   #define US_THREADS_LONG
 
 #endif
 
 #ifndef US_DEFAULT_MUTEX
   #define US_DEFAULT_MUTEX US_PREPEND_NAMESPACE(Mutex)
 #endif
 
 
 US_BEGIN_NAMESPACE
 
 class Mutex
 {
 public:
 
   Mutex() US_THREADS_MUTEX_CTOR(m_Mtx)
   {
     US_THREADS_MUTEX_INIT(m_Mtx);
   }
 
   ~Mutex()
   {
     US_THREADS_MUTEX_DELETE(m_Mtx);
   }
 
   void Lock()
   {
     US_THREADS_MUTEX_LOCK(m_Mtx);
   }
   void Unlock()
   {
     US_THREADS_MUTEX_UNLOCK(m_Mtx);
   }
 
 private:
 
   friend class WaitCondition;
 
   // Copy-constructor not implemented.
   Mutex(const Mutex &);
   // Copy-assignement operator not implemented.
   Mutex & operator = (const Mutex &);
 
   US_THREADS_MUTEX(m_Mtx)
 };
 
 template<class MutexPolicy = US_DEFAULT_MUTEX>
 class MutexLock
 {
 public:
   typedef MutexPolicy MutexType;
 
   MutexLock(MutexType& mtx) : m_Mtx(&mtx) { m_Mtx->Lock(); }
   ~MutexLock() { m_Mtx->Unlock(); }
 
 private:
   MutexType* m_Mtx;
 
   // purposely not implemented
   MutexLock(const MutexLock&);
   MutexLock& operator=(const MutexLock&);
 };
 
 typedef MutexLock<> DefaultMutexLock;
 
 
 /**
  * \brief A thread synchronization object used to suspend execution until some
  * condition on shared data is met.
  *
  * A thread calls Wait() to suspend its execution until the condition is
  * met. Each call to Notify() from an executing thread will then cause a single
  * waiting thread to be released.  A call to Notify() means, "signal
  * that the condition is true."  NotifyAll() releases all threads waiting on
  * the condition variable.
  *
  * The WaitCondition implementation is consistent with the standard
  * definition and use of condition variables in pthreads and other common
  * thread libraries.
  *
  * IMPORTANT: A condition variable always requires an associated mutex
  * object. The mutex object is used to avoid a dangerous race condition when
  * Wait() and Notify() are called simultaneously from two different
  * threads.
  *
  * On systems using pthreads, this implementation abstracts the
  * standard calls to the pthread condition variable.  On Win32
  * systems, there is no system provided condition variable.  This
  * class implements a condition variable using a critical section, a
  * semphore, an event and a number of counters.  The implementation is
  * almost an extract translation of the implementation presented by
  * Douglas C Schmidt and Irfan Pyarali in "Strategies for Implementing
  * POSIX Condition Variables on Win32". This article can be found at
  * http://www.cs.wustl.edu/~schmidt/win32-cv-1.html
  *
  */
 class US_EXPORT WaitCondition
 {
 public:
 
   typedef US_DEFAULT_MUTEX MutexType;
 
   WaitCondition();
   ~WaitCondition();
 
   /** Suspend execution of this thread until the condition is signaled. The
    *  argument is a SimpleMutex object that must be locked prior to calling
    *  this method.  */
   bool Wait(MutexType& mutex, unsigned long time = 0);
 
   bool Wait(MutexType* mutex, unsigned long time = 0);
 
   /** Notify that the condition is true and release one waiting thread */
   void Notify();
 
   /** Notify that the condition is true and release all waiting threads */
   void NotifyAll();
 
 private:
 
   // purposely not implemented
   WaitCondition(const WaitCondition& other);
   const WaitCondition& operator=(const WaitCondition&);
 
 #ifdef US_ENABLE_THREADING_SUPPORT
   #ifdef US_PLATFORM_POSIX
   pthread_cond_t m_WaitCondition;
   #else
 
   int m_NumberOfWaiters;                   // number of waiting threads
   CRITICAL_SECTION m_NumberOfWaitersLock;  // Serialize access to
   // m_NumberOfWaiters
 
   HANDLE m_Semaphore;                      // Semaphore to queue threads
   HANDLE m_WaitersAreDone;                 // Auto-reset event used by the
                                            // broadcast/signal thread to
                                            // wait for all the waiting
                                            // threads to wake up and
                                            // release the semaphore
 
   std::size_t m_WasNotifyAll;              // Keeps track of whether we
                                            // were broadcasting or signaling
   #endif
 
 #endif
 };
 
 US_END_NAMESPACE
 
 #ifdef US_ENABLE_THREADING_SUPPORT
 
 US_BEGIN_NAMESPACE
 
 template<class Host, class MutexPolicy = US_DEFAULT_MUTEX>
 class MultiThreaded
 {
   mutable MutexPolicy m_Mtx;
   WaitCondition m_Cond;
 
   #if !defined(US_ATOMIC_OPTIMIZATION)
   mutable MutexPolicy m_AtomicMtx;
   #endif
 
 public:
 
   MultiThreaded() : m_Mtx(), m_Cond() {}
   MultiThreaded(const MultiThreaded&) : m_Mtx(), m_Cond() {}
   virtual ~MultiThreaded() {}
 
   class Lock;
   friend class Lock;
 
   class Lock
   {
   public:
 
     // Lock object
     explicit Lock(const MultiThreaded& host) : m_Host(host)
     {
       m_Host.m_Mtx.Lock();
     }
 
     // Lock object
     explicit Lock(const MultiThreaded* host) : m_Host(*host)
     {
       m_Host.m_Mtx.Lock();
     }
 
     // Unlock object
     ~Lock()
     {
       m_Host.m_Mtx.Unlock();
     }
 
   private:
 
     // private by design
     Lock();
     Lock(const Lock&);
     Lock& operator=(const Lock&);
     const MultiThreaded& m_Host;
 
   };
 
   typedef volatile Host VolatileType;
   typedef US_THREADS_LONG IntType;
 
   bool Wait(unsigned long timeoutMillis = 0)
   {
     return m_Cond.Wait(m_Mtx, timeoutMillis);
   }
 
   void Notify()
   {
     m_Cond.Notify();
   }
 
   void NotifyAll()
   {
     m_Cond.NotifyAll();
   }
 
   IntType AtomicIncrement(volatile IntType& lval) const
   {
     US_ATOMIC_INCREMENT(&lval);
     return n;
   }
 
   IntType AtomicDecrement(volatile IntType& lval) const
   {
     US_ATOMIC_DECREMENT(&lval);
     return n;
   }
 
   void AtomicAssign(volatile IntType& lval, const IntType val) const
   {
     US_ATOMIC_ASSIGN(&lval, val);
   }
 
 };
 
 US_END_NAMESPACE
 
 #endif
 
 
 US_BEGIN_NAMESPACE
 
 template<class Host, class MutexPolicy = US_DEFAULT_MUTEX>
 class SingleThreaded
 {
 public:
 
   virtual ~SingleThreaded() {}
 
   // Dummy Lock class
   struct Lock
   {
     Lock() {}
     explicit Lock(const SingleThreaded&) {}
     explicit Lock(const SingleThreaded*) {}
   };
 
   typedef Host VolatileType;
   typedef int IntType;
 
   bool Wait(unsigned long = 0)
   { return false; }
 
   void Notify() {}
 
   void NotifyAll() {}
 
   static IntType AtomicAdd(volatile IntType& lval, const IntType val)
   { return lval += val; }
 
   static IntType AtomicSubtract(volatile IntType& lval, const IntType val)
   { return lval -= val; }
 
   static IntType AtomicMultiply(volatile IntType& lval, const IntType val)
   { return lval *= val; }
 
   static IntType AtomicDivide(volatile IntType& lval, const IntType val)
   { return lval /= val; }
 
   static IntType AtomicIncrement(volatile IntType& lval)
   { return ++lval; }
 
   static IntType AtomicDecrement(volatile IntType& lval)
   { return --lval; }
 
   static void AtomicAssign(volatile IntType & lval, const IntType val)
   { lval = val; }
 
   static void AtomicAssign(IntType & lval, volatile IntType & val)
   { lval = val; }
 
 };
 
 US_END_NAMESPACE
 
 #endif // USTHREADINGMODEL_H
diff --git a/Core/Code/CppMicroServices/src/util/usUtils.cpp b/Core/Code/CppMicroServices/src/util/usUtils.cpp
index 801f0a8a59..ffd8b2e38d 100644
--- a/Core/Code/CppMicroServices/src/util/usUtils.cpp
+++ b/Core/Code/CppMicroServices/src/util/usUtils.cpp
@@ -1,63 +1,108 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
-#include "usUtils.h"
+#include "usUtils_p.h"
+
+#include <cstdio>
 
 #ifdef US_PLATFORM_POSIX
-#include <errno.h>
-#include <string.h>
+  #include <errno.h>
+  #include <string.h>
 #else
-#ifndef WIN32_LEAN_AND_MEAN
-  #define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
+  #ifndef WIN32_LEAN_AND_MEAN
+    #define WIN32_LEAN_AND_MEAN
+  #endif
+  #include <windows.h>
+  #include <crtdbg.h>
 #endif
 
 US_BEGIN_NAMESPACE
 
 std::string GetLastErrorStr()
 {
 #ifdef US_PLATFORM_POSIX
   return std::string(strerror(errno));
 #else
   // Retrieve the system error message for the last-error code
   LPVOID lpMsgBuf;
   DWORD dw = GetLastError();
 
   FormatMessage(
     FORMAT_MESSAGE_ALLOCATE_BUFFER |
     FORMAT_MESSAGE_FROM_SYSTEM |
     FORMAT_MESSAGE_IGNORE_INSERTS,
     NULL,
     dw,
     MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
     (LPTSTR) &lpMsgBuf,
     0, NULL );
 
   std::string errMsg((LPCTSTR)lpMsgBuf);
 
   LocalFree(lpMsgBuf);
 
   return errMsg;
 #endif
 }
 
+static MsgHandler handler = 0;
+
+MsgHandler installMsgHandler(MsgHandler h)
+{
+  MsgHandler old = handler;
+  handler = h;
+  return old;
+}
+
+void message_output(MsgType msgType, const char *buf)
+{
+  if (handler)
+  {
+    (*handler)(msgType, buf);
+  }
+  else
+  {
+    fprintf(stderr, "%s\n", buf);
+    fflush(stderr);
+  }
+
+  if (msgType == ErrorMsg)
+  {
+  #if defined(_MSC_VER) && !defined(NDEBUG) && defined(_CRT_ERROR)
+    // get the current report mode
+    int reportMode = _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_WNDW);
+    _CrtSetReportMode(_CRT_ERROR, reportMode);
+    int ret = _CrtDbgReport(_CRT_ERROR, __FILE__, __LINE__, CppMicroServices_VERSION_STR, buf);
+    if (ret == 0  && reportMode & _CRTDBG_MODE_WNDW)
+      return; // ignore
+    else if (ret == 1)
+      _CrtDbgBreak();
+  #endif
+
+  #ifdef US_PLATFORM_POSIX
+    abort(); // trap; generates core dump
+  #else
+    exit(1); // goodbye cruel world
+  #endif
+  }
+}
+
 US_END_NAMESPACE
diff --git a/Core/Code/CppMicroServices/src/util/usUtils.h b/Core/Code/CppMicroServices/src/util/usUtils_p.h
similarity index 79%
rename from Core/Code/CppMicroServices/src/util/usUtils.h
rename to Core/Code/CppMicroServices/src/util/usUtils_p.h
index 156a718867..25a4a2d0e4 100644
--- a/Core/Code/CppMicroServices/src/util/usUtils.h
+++ b/Core/Code/CppMicroServices/src/util/usUtils_p.h
@@ -1,179 +1,210 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #ifndef USUTILS_H
 #define USUTILS_H
 
 #include <usConfig.h>
 
 #include <iostream>
 #include <sstream>
 #include <algorithm>
 
-#include <usExportMacros.h>
-
 
 //-------------------------------------------------------------------
 // Logging
 //-------------------------------------------------------------------
 
 US_BEGIN_NAMESPACE
 
+US_EXPORT void message_output(MsgType, const char* buf);
+
 struct LogMsg {
 
-  LogMsg() : enabled(true), buffer() {}
-  ~LogMsg() { std::cout << buffer.str() << std::endl; }
+  LogMsg(int t, const char* file, int ln, const char* func)
+    : type(static_cast<MsgType>(t)), enabled(true), buffer()
+  { buffer << "In " << func << " at " << file << ":" << ln << " : "; }
+
+  ~LogMsg() { if(enabled) message_output(type, buffer.str().c_str()); }
 
   template<typename T>
   LogMsg& operator<<(T t)
   {
-    if (enabled)
-    {
-      buffer << t;
-    }
+    if (enabled) buffer << t;
     return *this;
   }
 
   LogMsg& operator()(bool flag)
   {
     this->enabled = flag;
     return *this;
   }
 
 private:
 
+  MsgType type;
   bool enabled;
   std::stringstream buffer;
 };
 
+struct NoLogMsg {
+
+  template<typename T>
+  NoLogMsg& operator<<(T)
+  {
+    return *this;
+  }
+
+  NoLogMsg& operator()(bool)
+  {
+    return *this;
+  }
+
+};
+
 US_END_NAMESPACE
 
-#define US_DEBUG US_PREPEND_NAMESPACE(LogMsg)()
-#define US_INFO US_PREPEND_NAMESPACE(LogMsg)()
-#define US_ERROR US_PREPEND_NAMESPACE(LogMsg)()
-#define US_WARN US_PREPEND_NAMESPACE(LogMsg)()
+#if !defined(US_NO_DEBUG_OUTPUT)
+  #define US_DEBUG US_PREPEND_NAMESPACE(LogMsg)(0, __FILE__, __LINE__, __FUNCTION__)
+#else
+  #define US_DEBUG true ? US_PREPEND_NAMESPACE(NoLogMsg)() : US_PREPEND_NAMESPACE(NoLogMsg)()
+#endif
+
+#if !defined(US_NO_INFO_OUTPUT)
+  #define US_INFO US_PREPEND_NAMESPACE(LogMsg)(1, __FILE__, __LINE__, __FUNCTION__)
+#else
+  #define US_INFO  true ? US_PREPEND_NAMESPACE(NoLogMsg)() : US_PREPEND_NAMESPACE(NoLogMsg)()
+#endif
+
+#if !defined(US_NO_WARNING_OUTPUT)
+  #define US_WARN US_PREPEND_NAMESPACE(LogMsg)(2, __FILE__, __LINE__, __FUNCTION__)
+#else
+  #define US_WARN true ? US_PREPEND_NAMESPACE(LogMsg)() : US_PREPEND_NAMESPACE(LogMsg)()
+#endif
+
+#define US_ERROR US_PREPEND_NAMESPACE(LogMsg)(3, __FILE__, __LINE__, __FUNCTION__)
 
 //-------------------------------------------------------------------
 // Error handling
 //-------------------------------------------------------------------
 
 US_BEGIN_NAMESPACE
 
 US_EXPORT std::string GetLastErrorStr();
 
 US_END_NAMESPACE
 
 
 //-------------------------------------------------------------------
 // Functors
 //-------------------------------------------------------------------
 
 #include <usServiceEvent.h>
 #include <usModuleEvent.h>
 
 #if defined(US_USE_CXX11) || defined(__GNUC__)
 
   #ifdef US_USE_CXX11
     #include <functional>
     #define US_MODULE_LISTENER_FUNCTOR std::function<void(const US_PREPEND_NAMESPACE(ModuleEvent)&)>
     #define US_SERVICE_LISTENER_FUNCTOR std::function<void(const US_PREPEND_NAMESPACE(ServiceEvent)&)>
   #else
     #include <tr1/functional>
     #define US_MODULE_LISTENER_FUNCTOR std::tr1::function<void(const US_PREPEND_NAMESPACE(ModuleEvent)&)>
     #define US_SERVICE_LISTENER_FUNCTOR std::tr1::function<void(const US_PREPEND_NAMESPACE(ServiceEvent)&)>
   #endif
 
   US_BEGIN_NAMESPACE
     template<class X>
     US_MODULE_LISTENER_FUNCTOR ModuleListenerMemberFunctor(X* x, void (X::*memFn)(const US_PREPEND_NAMESPACE(ModuleEvent)))
     { return std::bind1st(std::mem_fun(memFn), x); }
   US_END_NAMESPACE
 
   US_BEGIN_NAMESPACE
     struct ModuleListenerCompare : std::binary_function<US_MODULE_LISTENER_FUNCTOR, US_MODULE_LISTENER_FUNCTOR, bool>
     {
       bool operator()(const US_MODULE_LISTENER_FUNCTOR& f1,
                       const US_MODULE_LISTENER_FUNCTOR& f2) const
       {
         return f1.target<void(const US_PREPEND_NAMESPACE(ModuleEvent)&)>() == f2.target<void(const US_PREPEND_NAMESPACE(ModuleEvent)&)>();
       }
     };
   US_END_NAMESPACE
 
   US_BEGIN_NAMESPACE
     template<class X>
     US_SERVICE_LISTENER_FUNCTOR ServiceListenerMemberFunctor(X* x, void (X::*memFn)(const US_PREPEND_NAMESPACE(ServiceEvent)))
     { return std::bind1st(std::mem_fun(memFn), x); }
   US_END_NAMESPACE
 
   US_BEGIN_NAMESPACE
     struct ServiceListenerCompare : std::binary_function<US_SERVICE_LISTENER_FUNCTOR, US_SERVICE_LISTENER_FUNCTOR, bool>
     {
       bool operator()(const US_SERVICE_LISTENER_FUNCTOR& f1,
                       const US_SERVICE_LISTENER_FUNCTOR& f2) const
       {
         return f1.target<void(const US_PREPEND_NAMESPACE(ServiceEvent)&)>() == f2.target<void(const US_PREPEND_NAMESPACE(ServiceEvent)&)>();
       }
     };
   US_END_NAMESPACE
 
 #else
 
-  #include <usFunctor.h>
+  #include <usFunctor_p.h>
 
   #define US_MODULE_LISTENER_FUNCTOR US_PREPEND_NAMESPACE(Functor)<const US_PREPEND_NAMESPACE(ModuleEvent)&>
 
   US_BEGIN_NAMESPACE
     template<class X, typename MemFn>
     US_MODULE_LISTENER_FUNCTOR ModuleListenerMemberFunctor(X* x, MemFn memFn)
     { return Functor<const ModuleEvent&>(x, memFn); }
   US_END_NAMESPACE
 
   US_BEGIN_NAMESPACE
     struct ModuleListenerCompare : std::binary_function<US_MODULE_LISTENER_FUNCTOR, US_MODULE_LISTENER_FUNCTOR, bool>
     {
       bool operator()(const US_MODULE_LISTENER_FUNCTOR& f1,
                       const US_MODULE_LISTENER_FUNCTOR& f2) const
       { return f1 == f2; }
     };
   US_END_NAMESPACE
 
   #define US_SERVICE_LISTENER_FUNCTOR US_PREPEND_NAMESPACE(Functor)<const US_PREPEND_NAMESPACE(ServiceEvent)&>
 
   US_BEGIN_NAMESPACE
     template<class X, typename MemFn>
     US_SERVICE_LISTENER_FUNCTOR ServiceListenerMemberFunctor(X* x, MemFn memFn)
     { return Functor<const ServiceEvent&>(x, memFn); }
   US_END_NAMESPACE
 
   US_BEGIN_NAMESPACE
     struct ServiceListenerCompare : std::binary_function<US_SERVICE_LISTENER_FUNCTOR, US_SERVICE_LISTENER_FUNCTOR, bool>
     {
       bool operator()(const US_SERVICE_LISTENER_FUNCTOR& f1,
                       const US_SERVICE_LISTENER_FUNCTOR& f2) const
       { return f1 == f2; }
     };
   US_END_NAMESPACE
 
 #endif
 
 #endif // USUTILS_H
diff --git a/Core/Code/CppMicroServices/test/CMakeLists.txt b/Core/Code/CppMicroServices/test/CMakeLists.txt
index 96e62a8e6a..27d10d085e 100644
--- a/Core/Code/CppMicroServices/test/CMakeLists.txt
+++ b/Core/Code/CppMicroServices/test/CMakeLists.txt
@@ -1,80 +1,81 @@
 
 #-----------------------------------------------------------------------------
 # Configure files, include dirs, etc.
 #-----------------------------------------------------------------------------
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/usTestingConfig.h.in" "${PROJECT_BINARY_DIR}/include/usTestingConfig.h")
 
 include_directories(${US_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR})
 if(NOT US_ENABLE_SERVICE_FACTORY_SUPPORT)
   include_directories(${US_BASECLASS_INCLUDE_DIRS})
 endif()
 
 link_directories(${US_LINK_DIRS})
 if(NOT US_ENABLE_SERVICE_FACTORY_SUPPORT)
   link_directories(${US_BASECLASS_LIBRARY_DIRS})
 endif()
 
 #-----------------------------------------------------------------------------
 # Create test modules
 #-----------------------------------------------------------------------------
 
 include(usFunctionCreateTestModule)
 
 set(_us_test_module_libs "" CACHE INTERNAL "" FORCE)
 add_subdirectory(modules)
 
 #-----------------------------------------------------------------------------
 # Add unit tests
 #-----------------------------------------------------------------------------
 
 set(_tests
+  usDebugOutputTest
   usLDAPFilterTest
   usModuleTest
   usServiceListenerTest
   usServiceTrackerTest
 )
 
 set(_test_driver ${PROJECT_NAME}TestDriver)
 create_test_sourcelist(_srcs ${_test_driver}.cpp ${_tests})
 
 # Generate a custom "module init" file for the test driver executable
 set(MODULE_DEPENDS_STR )
 foreach(_dep ${US_LINK_LIBRARIES})
   set(MODULE_DEPENDS_STR "${MODULE_DEPENDS_STR} ${_dep}")
 endforeach()
 
 usFunctionGenerateModuleInit(_srcs
                              NAME ${_test_driver}
                              DEPENDS "${MODULE_DEPENDS_STR}"
                              VERSION "0.1.0"
                              EXECUTABLE
                             )
 
 add_executable(${_test_driver} ${_srcs} usTestManager.cpp)
 if(NOT US_BUILD_SHARED_LIBS)
   target_link_libraries(${_test_driver} ${_us_test_module_libs})
 endif()
 target_link_libraries(${_test_driver} ${US_LINK_LIBRARIES})
 
 if(NOT US_ENABLE_SERVICE_FACTORY_SUPPORT)
   target_link_libraries(${_test_driver} ${US_BASECLASS_LIBRARIES})
 endif()
 
 # Register tests
 foreach(_test ${_tests})
   add_test(NAME ${_test} COMMAND ${_test_driver} ${_test})
 endforeach()
 if(US_TEST_LABELS)
   set_tests_properties(${_tests} PROPERTIES LABELS "${US_TEST_LABELS}")
 endif()
 
 #-----------------------------------------------------------------------------
 # Add dependencies for shared libraries
 #-----------------------------------------------------------------------------
 
 if(US_BUILD_SHARED_LIBS)
   foreach(_test_module ${_us_test_module_libs})
     add_dependencies(${_test_driver} ${_test_module})
   endforeach()
 endif()
diff --git a/Core/Code/CppMicroServices/test/usDebugOutputTest.cpp b/Core/Code/CppMicroServices/test/usDebugOutputTest.cpp
new file mode 100644
index 0000000000..721ad6e351
--- /dev/null
+++ b/Core/Code/CppMicroServices/test/usDebugOutputTest.cpp
@@ -0,0 +1,100 @@
+/*=============================================================================
+
+  Library: CppMicroServices
+
+  Copyright (c) German Cancer Research Center,
+    Division of Medical and Biological Informatics
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+=============================================================================*/
+
+#include <usUtils_p.h>
+
+#include "usTestingMacros.h"
+
+US_USE_NAMESPACE
+
+static int lastMsgType = -1;
+static std::string lastMsg;
+
+void handleMessages(MsgType type, const char* msg)
+{
+  lastMsgType = type;
+  lastMsg.assign(msg);
+}
+
+void resetLastMsg()
+{
+  lastMsgType = -1;
+  lastMsg.clear();
+}
+
+int usDebugOutputTest(int /*argc*/, char* /*argv*/[])
+{
+  US_TEST_BEGIN("DebugOutputTest");
+
+  // Use the default message handler
+  {
+    US_DEBUG << "Msg";
+    US_DEBUG(false) << "Msg";
+    US_INFO << "Msg";
+    US_INFO(false) << "Msg";
+    US_WARN << "Msg";
+    US_WARN(false) << "Msg";
+  }
+  US_TEST_CONDITION(lastMsg.empty(), "Testing default message handler");
+
+  resetLastMsg();
+
+  installMsgHandler(handleMessages);
+  {
+    US_DEBUG << "Msg";
+  }
+#ifdef NDEBUG
+  US_TEST_CONDITION(lastMsgType == -1 && lastMsg.empty(), "Testing suppressed debug message")
+#else
+  US_TEST_CONDITION(lastMsgType == 0 && lastMsg.find("Msg") != std::string::npos, "Testing debug message")
+#endif
+  resetLastMsg();
+
+  {
+    US_DEBUG(false) << "No msg";
+  }
+  US_TEST_CONDITION(lastMsgType == -1 && lastMsg.empty(), "Testing disabled debug message")
+  resetLastMsg();
+
+  {
+    US_INFO << "Info msg";
+  }
+  US_TEST_CONDITION(lastMsgType == 1 && lastMsg.find("Info msg") != std::string::npos, "Testing informational message")
+  resetLastMsg();
+
+  {
+    US_WARN << "Warn msg";
+  }
+  US_TEST_CONDITION(lastMsgType == 2 && lastMsg.find("Warn msg") != std::string::npos, "Testing warning message")
+  resetLastMsg();
+
+  // We cannot test US_ERROR since it will call abort().
+
+  installMsgHandler(0);
+
+  {
+    US_INFO << "Info msg";
+  }
+  US_TEST_CONDITION(lastMsgType == -1 && lastMsg.empty(), "Testing message handler reset")
+
+  US_TEST_END()
+}
+
diff --git a/Core/Code/CppMicroServices/test/usModuleTest.cpp b/Core/Code/CppMicroServices/test/usModuleTest.cpp
index d72e8efda0..e448a4d5f4 100644
--- a/Core/Code/CppMicroServices/test/usModuleTest.cpp
+++ b/Core/Code/CppMicroServices/test/usModuleTest.cpp
@@ -1,382 +1,382 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 #include <usModule.h>
 #include <usModuleEvent.h>
 #include <usServiceEvent.h>
 #include <usModuleContext.h>
 #include <usGetModuleContext.h>
 #include <usModuleRegistry.h>
 #include <usModuleActivator.h>
 
 #include US_BASECLASS_HEADER
 
 #include "usTestUtilSharedLibrary.cpp"
 #include "usTestingMacros.h"
 
 US_USE_NAMESPACE
 
 extern ModuleActivator* _us_module_activator_instance_TestModuleA();
 
 class TestModuleListener {
 
 public:
 
   TestModuleListener(ModuleContext* mc) : mc(mc), serviceEvents(), moduleEvents()
   {}
 
   void ModuleChanged(const ModuleEvent event)
   {
     moduleEvents.push_back(event);
     US_DEBUG << "ModuleEvent:" << event;
   }
 
   void ServiceChanged(const ServiceEvent event)
   {
     serviceEvents.push_back(event);
     US_DEBUG << "ServiceEvent:" << event;
   }
 
   ModuleEvent GetModuleEvent() const
   {
     if (moduleEvents.empty())
     {
       return ModuleEvent();
     }
     return moduleEvents.back();
   }
 
   ServiceEvent GetServiceEvent() const
   {
     if (serviceEvents.empty())
     {
       return ServiceEvent();
     }
     return serviceEvents.back();
   }
 
   bool CheckListenerEvents(
       bool pexp, ModuleEvent::Type ptype,
       bool sexp, ServiceEvent::Type stype,
       Module* moduleX, ServiceReference* servX)
   {
     std::vector<ModuleEvent> pEvts;
     std::vector<ServiceEvent> seEvts;
 
     if (pexp) pEvts.push_back(ModuleEvent(ptype, moduleX));
     if (sexp) seEvts.push_back(ServiceEvent(stype, *servX));
 
     return CheckListenerEvents(pEvts, seEvts);
   }
 
   bool CheckListenerEvents(
       const std::vector<ModuleEvent>& pEvts,
       const std::vector<ServiceEvent>& seEvts)
   {
     bool listenState = true; // assume everything will work
 
     if (pEvts.size() != moduleEvents.size())
     {
       listenState = false;
       US_DEBUG << "*** Module event mismatch: expected "
           << pEvts.size() << " event(s), found "
           << moduleEvents.size() << " event(s).";
 
       const std::size_t max = pEvts.size() > moduleEvents.size() ? pEvts.size() : moduleEvents.size();
       for (std::size_t i = 0; i < max; ++i)
       {
         const ModuleEvent& pE = i < pEvts.size() ? pEvts[i] : ModuleEvent();
         const ModuleEvent& pR = i < moduleEvents.size() ? moduleEvents[i] : ModuleEvent();
         US_DEBUG << "    " << pE << " - " << pR;
       }
     }
     else
     {
       for (std::size_t i = 0; i < pEvts.size(); ++i)
       {
         const ModuleEvent& pE = pEvts[i];
         const ModuleEvent& pR = moduleEvents[i];
         if (pE.GetType() != pR.GetType()
           || pE.GetModule() != pR.GetModule())
         {
           listenState = false;
           US_DEBUG << "*** Wrong module event: " << pR << " expected " << pE;
         }
       }
     }
 
     if (seEvts.size() != serviceEvents.size())
     {
       listenState = false;
       US_DEBUG << "*** Service event mismatch: expected "
           << seEvts.size() << " event(s), found "
           << serviceEvents.size() << " event(s).";
 
       const std::size_t max = seEvts.size() > serviceEvents.size()
                       ? seEvts.size() : serviceEvents.size();
       for (std::size_t i = 0; i < max; ++i)
       {
         const ServiceEvent& seE = i < seEvts.size() ? seEvts[i] : ServiceEvent();
         const ServiceEvent& seR = i < serviceEvents.size() ? serviceEvents[i] : ServiceEvent();
         US_DEBUG << "    " << seE << " - " << seR;
       }
     }
     else
     {
       for (std::size_t i = 0; i < seEvts.size(); ++i)
       {
         const ServiceEvent& seE = seEvts[i];
         const ServiceEvent& seR = serviceEvents[i];
         if (seE.GetType() != seR.GetType()
           || (!(seE.GetServiceReference() == seR.GetServiceReference())))
         {
           listenState = false;
           US_DEBUG << "*** Wrong service event: " << seR << " expected " << seE;
         }
       }
     }
 
     moduleEvents.clear();
     serviceEvents.clear();
     return listenState;
   }
 
 private:
 
   ModuleContext* const mc;
 
   std::vector<ServiceEvent> serviceEvents;
   std::vector<ModuleEvent> moduleEvents;
 };
 
 // Verify information from the ModuleInfo struct
 void frame005a(ModuleContext* mc)
 {
   Module* m = mc->GetModule();
 
   // check expected headers
 
   US_TEST_CONDITION("CppMicroServicesTestDriver" == m->GetName(), "Test module name");
 //  US_DEBUG << "Version: " << m->GetVersion();
   US_TEST_CONDITION(ModuleVersion(0,1,0) == m->GetVersion(), "Test module version")
 }
 
 // Get context id, location and status of the module
 void frame010a(ModuleContext* mc)
 {
   Module* m = mc->GetModule();
 
   long int contextid = m->GetModuleId();
   US_DEBUG << "CONTEXT ID:" << contextid;
 
   std::string location = m->GetLocation();
   US_DEBUG << "LOCATION:" << location;
   US_TEST_CONDITION(!location.empty(), "Test for non-empty module location")
 
   US_TEST_CONDITION(m->IsLoaded(), "Test for loaded flag")
 }
 
 //----------------------------------------------------------------------------
 //Test result of GetService(ServiceReference()). Should throw std::invalid_argument
 void frame018a(ModuleContext* mc)
 {
   try
   {
     US_BASECLASS_NAME* obj = mc->GetService(ServiceReference());
     US_DEBUG << "Got service object = " << us_service_impl_name(obj) << ", expected std::invalid_argument exception";
     US_TEST_FAILED_MSG(<< "Got service object, excpected std::invalid_argument exception")
   }
   catch (const std::invalid_argument& )
   {}
   catch (...)
   {
     US_TEST_FAILED_MSG(<< "Got wrong exception, expected std::invalid_argument")
   }
 }
 
 // Load libA and check that it exists and that the service it registers exists,
 // also check that the expected events occur
 void frame020a(ModuleContext* mc, TestModuleListener& listener, SharedLibraryHandle& libA)
 {
   try
   {
     libA.Load();
   }
   catch (const std::exception& e)
   {
     US_TEST_FAILED_MSG(<< "Load module exception: " << e.what())
   }
 
 #ifdef US_BUILD_SHARED_LIBS
-  Module* moduleA = ModuleRegistry::GetModule("TestModuleA");
-  US_TEST_CONDITION_REQUIRED(moduleA != 0, "Test for existing moudle TestModuleA")
+  Module* moduleA = ModuleRegistry::GetModule("TestModuleA Module");
+  US_TEST_CONDITION_REQUIRED(moduleA != 0, "Test for existing module TestModuleA")
 
-  US_TEST_CONDITION(moduleA->GetName() == "TestModuleA", "Test module name")
+  US_TEST_CONDITION(moduleA->GetName() == "TestModuleA Module", "Test module name")
 #endif
 
   // Check if libA registered the expected service
   try
   {
     ServiceReference sr1 = mc->GetServiceReference("org.cppmicroservices.TestModuleAService");
     US_BASECLASS_NAME* o1 = mc->GetService(sr1);
     US_TEST_CONDITION(o1 != 0, "Test if service object found");
 
     try
     {
       US_TEST_CONDITION(mc->UngetService(sr1), "Test if Service UnGet returns true");
     }
     catch (const std::logic_error le)
     {
       US_TEST_FAILED_MSG(<< "UnGetService exception: " << le.what())
     }
 
     // check the listeners for events
     std::vector<ModuleEvent> pEvts;
 #ifdef US_BUILD_SHARED_LIBS
     pEvts.push_back(ModuleEvent(ModuleEvent::LOADING, moduleA));
     pEvts.push_back(ModuleEvent(ModuleEvent::LOADED, moduleA));
 #endif
 
     std::vector<ServiceEvent> seEvts;
     seEvts.push_back(ServiceEvent(ServiceEvent::REGISTERED, sr1));
 
     US_TEST_CONDITION(listener.CheckListenerEvents(pEvts, seEvts), "Test for unexpected events");
 
   }
   catch (const ServiceException& /*se*/)
   {
     US_TEST_FAILED_MSG(<< "test module, expected service not found");
   }
 
 #ifdef US_BUILD_SHARED_LIBS
   US_TEST_CONDITION(moduleA->IsLoaded() == true, "Test if loaded correctly");
 #endif
 }
 
 
 // Unload libA and check for correct events
 void frame030b(ModuleContext* mc, TestModuleListener& listener, SharedLibraryHandle& libA)
 {
 #ifdef US_BUILD_SHARED_LIBS
-  Module* moduleA = ModuleRegistry::GetModule("TestModuleA");
+  Module* moduleA = ModuleRegistry::GetModule("TestModuleA Module");
   US_TEST_CONDITION_REQUIRED(moduleA != 0, "Test for non-null module")
 #endif
 
   ServiceReference sr1
       = mc->GetServiceReference("org.cppmicroservices.TestModuleAService");
   US_TEST_CONDITION(sr1, "Test for valid service reference")
 
   try
   {
     libA.Unload();
 #ifdef US_BUILD_SHARED_LIBS
     US_TEST_CONDITION(moduleA->IsLoaded() == false, "Test for unloaded state")
 #endif
   }
   catch (const std::exception& e)
   {
     US_TEST_FAILED_MSG(<< "UnLoad module exception: " << e.what())
   }
 
   std::vector<ModuleEvent> pEvts;
 #ifdef US_BUILD_SHARED_LIBS
   pEvts.push_back(ModuleEvent(ModuleEvent::UNLOADING, moduleA));
   pEvts.push_back(ModuleEvent(ModuleEvent::UNLOADED, moduleA));
 #endif
 
   std::vector<ServiceEvent> seEvts;
   seEvts.push_back(ServiceEvent(ServiceEvent::UNREGISTERING, sr1));
 
   US_TEST_CONDITION(listener.CheckListenerEvents(pEvts, seEvts), "Test for unexpected events");
 }
 
 
 struct LocalListener {
   void ServiceChanged(const ServiceEvent) {}
 };
 
 // Add a service listener with a broken LDAP filter to Get an exception
 void frame045a(ModuleContext* mc)
 {
   LocalListener sListen1;
   std::string brokenFilter = "A broken LDAP filter";
 
   try
   {
     mc->AddServiceListener(&sListen1, &LocalListener::ServiceChanged, brokenFilter);
   }
   catch (const std::invalid_argument& /*ia*/)
   {
     //assertEquals("InvalidSyntaxException.GetFilter should be same as input string", brokenFilter, ise.GetFilter());
   }
   catch (...)
   {
     US_TEST_FAILED_MSG(<< "test module, wrong exception on broken LDAP filter:");
   }
 }
 
 
 int usModuleTest(int /*argc*/, char* /*argv*/[])
 {
   US_TEST_BEGIN("ModuleTest");
 
   ModuleContext* mc = GetModuleContext();
   TestModuleListener listener(mc);
 
   try
   {
     mc->AddModuleListener(&listener, &TestModuleListener::ModuleChanged);
   }
   catch (const std::logic_error& ise)
   {
     US_TEST_OUTPUT( << "module listener registration failed " << ise.what() );
     throw;
   }
 
   try
   {
     mc->AddServiceListener(&listener, &TestModuleListener::ServiceChanged);
   }
   catch (const std::logic_error& ise)
   {
     US_TEST_OUTPUT( << "service listener registration failed " << ise.what() );
     throw;
   }
 
   frame005a(mc);
   frame010a(mc);
   frame018a(mc);
 
   SharedLibraryHandle libA("TestModuleA"
                              #ifndef US_BUILD_SHARED_LIBS
                                , _us_module_activator_instance_TestModuleA
                              #endif
                                );
   frame020a(mc, listener, libA);
   frame030b(mc, listener, libA);
 
   frame045a(mc);
 
   mc->RemoveModuleListener(&listener, &TestModuleListener::ModuleChanged);
   mc->RemoveServiceListener(&listener, &TestModuleListener::ServiceChanged);
 
   US_TEST_END()
 }
diff --git a/Core/Code/CppMicroServices/test/usTestUtilSharedLibrary.cpp b/Core/Code/CppMicroServices/test/usTestUtilSharedLibrary.cpp
index 738c0cd10d..f3ac74c59b 100644
--- a/Core/Code/CppMicroServices/test/usTestUtilSharedLibrary.cpp
+++ b/Core/Code/CppMicroServices/test/usTestUtilSharedLibrary.cpp
@@ -1,159 +1,159 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 #include <string>
 #include <stdexcept>
 
 #include <usTestingConfig.h>
-#include <usUtils.h>
+#include <usUtils_p.h>
 #include <usModuleRegistry.h>
 #include <usModuleActivator.h>
 
 
 #if defined(US_PLATFORM_POSIX)
   #include <dlfcn.h>
 #elif defined(US_PLATFORM_WINDOWS)
   #define WIN32_LEAN_AND_MEAN
   #include <windows.h>
   #include <strsafe.h>
 #else
   #error Unsupported platform
 #endif
 
 
 US_BEGIN_NAMESPACE
 
 class SharedLibraryHandle
 {
 public:
 
   SharedLibraryHandle() : m_Handle(0) {}
 
   SharedLibraryHandle(const std::string& name, ModuleActivatorInstanceFunction activatorFunc = 0)
     : m_Name(name), m_ActivatorFunc(activatorFunc), m_Handle(0)
   {}
 
   virtual ~SharedLibraryHandle() {}
 
   void Load()
   {
     Load(m_Name);
   }
 
   void Load(const std::string& name)
   {
 #ifdef US_BUILD_SHARED_LIBS
     if (m_Handle) throw std::logic_error(std::string("Library already loaded: ") + name);
     std::string libPath = GetAbsolutePath(name);
 #ifdef US_PLATFORM_POSIX
     m_Handle = dlopen(libPath.c_str(), RTLD_LAZY | RTLD_GLOBAL);
     if (!m_Handle)
     {
      const char* err = dlerror();
      throw std::runtime_error(err ? std::string(err) : libPath);
     }
 #else
     m_Handle = LoadLibrary(libPath.c_str());
     if (!m_Handle)
     {
       std::string errMsg = "Loading ";
       errMsg.append(libPath).append("failed with error: ").append(GetLastErrorStr());
 
       throw std::runtime_error(errMsg);
     }
 #endif
 
 #else // US_BUILD_SHARED_LIBS
 
     m_ActivatorFunc()->Load(GetModuleContext());
 
 #endif
     
     m_Name = name;
   }
 
   void Unload()
   {
 #ifdef US_BUILD_SHARED_LIBS
     if (m_Handle)
     {
 #ifdef US_PLATFORM_POSIX
      dlclose(m_Handle);
 #else
       FreeLibrary((HMODULE)m_Handle);
 #endif
      m_Handle = 0;
     }
 #else // US_BUILD_SHARED_LIBS
     m_ActivatorFunc()->Unload(GetModuleContext());
 #endif
   }
 
   std::string GetAbsolutePath(const std::string& name)
   {
     return GetLibraryPath() + "/" + Prefix() + name + Suffix();
   }
 
   std::string GetAbsolutePath()
   {
     return GetLibraryPath() + "/" + Prefix() + m_Name + Suffix();
   }
 
   static std::string GetLibraryPath()
   {
 #ifdef US_PLATFORM_WINDOWS
     return std::string(US_RUNTIME_OUTPUT_DIRECTORY);
 #else
     return std::string(US_LIBRARY_OUTPUT_DIRECTORY);
 #endif
   }
 
   static std::string Suffix()
   {
 #ifdef US_PLATFORM_WINDOWS
     return ".dll";
 #elif defined(US_PLATFORM_APPLE)
     return ".dylib";
 #else
     return ".so";
 #endif
   }
 
   static std::string Prefix()
   {
 #if defined(US_PLATFORM_POSIX)
     return "lib";
 #else
     return "";
 #endif
   }
 
 private:
 
   SharedLibraryHandle(const SharedLibraryHandle&);
   SharedLibraryHandle& operator = (const SharedLibraryHandle&);
 
   std::string m_Name;
   ModuleActivatorInstanceFunction m_ActivatorFunc;
   void* m_Handle;
 };
 
 US_END_NAMESPACE
diff --git a/Core/Code/CppMicroServices/usConfig.h.in b/Core/Code/CppMicroServices/usConfig.h.in
index 6d12006f80..e6ce942560 100644
--- a/Core/Code/CppMicroServices/usConfig.h.in
+++ b/Core/Code/CppMicroServices/usConfig.h.in
@@ -1,157 +1,224 @@
 /*
   USCONFIG.h
   this file is generated. Do not change!
 */
 
 #ifndef USCONFIG_H
 #define USCONFIG_H
 
 #cmakedefine US_BUILD_SHARED_LIBS
 #cmakedefine CppMicroServices_EXPORTS
 #cmakedefine US_ENABLE_THREADING_SUPPORT
 #cmakedefine US_ENABLE_SERVICE_FACTORY_SUPPORT
 #cmakedefine US_USE_CXX11
 
+///-------------------------------------------------------------------
+// Version information
+//-------------------------------------------------------------------
+
+#define CppMicroServices_VERSION_MAJOR @CppMicroServices_VERSION_MAJOR@
+#define CppMicroServices_VERSION_MINOR @CppMicroServices_VERSION_MINOR@
+#define CppMicroServices_VERSION_PATH @CppMicroServices_VERSION_PATCH@
+#define CppMicroServices_VERSION @CppMicroServices_VERSION@
+#define CppMicroServices_VERSION_STR "@CppMicroServices_VERSION@"
+
+///-------------------------------------------------------------------
+// Macros for import/export declarations
+//-------------------------------------------------------------------
+
+#if defined(WIN32)
+  #define US_ABI_EXPORT __declspec(dllexport)
+  #define US_ABI_IMPORT __declspec(dllimport)
+  #define US_ABI_LOCAL
+#else
+  #if __GNUC__ >= 4
+    #define US_ABI_EXPORT __attribute__ ((visibility ("default")))
+    #define US_ABI_IMPORT __attribute__ ((visibility ("default")))
+    #define US_ABI_LOCAL  __attribute__ ((visibility ("hidden")))
+  #else
+    #define US_ABI_EXPORT
+    #define US_ABI_IMPORT
+    #define US_ABI_LOCAL
+  #endif
+#endif
+
+#ifdef US_BUILD_SHARED_LIBS
+  // We are building a shared lib
+  #ifdef CppMicroServices_EXPORTS
+    #define US_EXPORT US_ABI_EXPORT
+  #else
+    #define US_EXPORT US_ABI_IMPORT
+  #endif
+#else
+  // We are building a static lib
+  #if __GNUC__ >= 4
+    // Don't hide RTTI symbols of definitions in the C++ Micro Services
+    // headers that are included in DSOs with hidden visibility
+    #define US_EXPORT US_ABI_EXPORT
+  #else
+    #define US_EXPORT
+  #endif
+#endif
+
 //-------------------------------------------------------------------
 // Namespace customization
 //-------------------------------------------------------------------
 
 #define US_NAMESPACE @US_NAMESPACE@
 
 #ifndef US_NAMESPACE /* user namespace */
 
   # define US_PREPEND_NAMESPACE(name) ::name
   # define US_USE_NAMESPACE
   # define US_BEGIN_NAMESPACE
   # define US_END_NAMESPACE
   # define US_FORWARD_DECLARE_CLASS(name) class name;
   # define US_FORWARD_DECLARE_STRUCT(name) struct name;
 
 #else /* user namespace */
 
   # define US_PREPEND_NAMESPACE(name) ::US_NAMESPACE::name
   # define US_USE_NAMESPACE using namespace ::US_NAMESPACE;
   # define US_BEGIN_NAMESPACE namespace US_NAMESPACE {
   # define US_END_NAMESPACE }
   # define US_FORWARD_DECLARE_CLASS(name) \
     US_BEGIN_NAMESPACE class name; US_END_NAMESPACE
 
   # define US_FORWARD_DECLARE_STRUCT(name) \
     US_BEGIN_NAMESPACE struct name; US_END_NAMESPACE
 
   namespace US_NAMESPACE {}
 
 #endif /* user namespace */
 
 #define US_BASECLASS_NAME @US_BASECLASS_NAME@
 #define US_BASECLASS_HEADER <@US_BASECLASS_HEADER@>
 
 // base class forward declaration
 @US_BASECLASS_FORWARD_DECLARATION@
 
 //-------------------------------------------------------------------
 // Platform defines
 //-------------------------------------------------------------------
 
 #if defined(__APPLE__)
   #define US_PLATFORM_APPLE
 #endif
 
 #if defined(_WIN32) || defined(_WIN64)
   #define US_PLATFORM_WINDOWS
 #else
   #define US_PLATFORM_POSIX
 #endif
 
 //-------------------------------------------------------------------
 // Compiler defines
 //-------------------------------------------------------------------
 
 #if defined(_MSC_VER) && !defined(_SCL_SECURE_NO_WARNINGS)
   #define _SCL_SECURE_NO_WARNINGS
 #endif
 
+//-------------------------------------------------------------------
+// Debuging & Logging
+//-------------------------------------------------------------------
+
+#if defined(NDEBUG) && !defined(US_NO_DEBUG_OUTPUT)
+  #define US_NO_DEBUG_OUTPUT
+#endif
+
+US_BEGIN_NAMESPACE
+  enum MsgType { DebugMsg = 0, InfoMsg = 1, WarningMsg = 2, ErrorMsg = 3 };
+  typedef void (*MsgHandler)(MsgType, const char *);
+  US_EXPORT MsgHandler installMsgHandler(MsgHandler);
+US_END_NAMESPACE
+
 //-------------------------------------------------------------------
 // Hash Container
 //-------------------------------------------------------------------
 
 #ifdef US_USE_CXX11
 
   #include <unordered_map>
   #include <unordered_set>
 
   #define US_HASH_FUNCTION_BEGIN(type) \
   template<> \
   struct hash<type> : std::unary_function<type, std::size_t> { \
   std::size_t operator()(const type& arg) const {
 
   #define US_HASH_FUNCTION_END } };
 
   #define US_HASH_FUNCTION(type, arg) hash<type>()(arg)
-  #define US_HASH_FUNCTION_FRIEND(type) friend struct ::std::hash<type>
+  
+  #ifdef US_PLATFORM_WINDOWS
+    #define US_HASH_FUNCTION_FRIEND(type) friend class ::std::hash<type>
+  #else
+    #define US_HASH_FUNCTION_FRIEND(type) friend struct ::std::hash<type>
+  #endif
 
   #define US_UNORDERED_MAP_TYPE ::std::unordered_map
   #define US_UNORDERED_SET_TYPE ::std::unordered_set
 
   #define US_HASH_FUNCTION_NAMESPACE ::std
   #define US_HASH_FUNCTION_NAMESPACE_BEGIN namespace std {
   #define US_HASH_FUNCTION_NAMESPACE_END }
 
 #elif defined(__GNUC__)
 
   #include <tr1/unordered_map>
   #include <tr1/unordered_set>
   
   #define US_HASH_FUNCTION_BEGIN(type) \
   template<> \
   struct hash<type> : std::unary_function<type, std::size_t> { \
   std::size_t operator()(const type& arg) const { 
   
   #define US_HASH_FUNCTION_END } };
   
   #define US_HASH_FUNCTION(type, arg) hash<type>()(arg)
   #define US_HASH_FUNCTION_FRIEND(type) friend struct ::std::tr1::hash<type>
 
   #define US_UNORDERED_MAP_TYPE ::std::tr1::unordered_map
   #define US_UNORDERED_SET_TYPE ::std::tr1::unordered_set
 
   #define US_HASH_FUNCTION_NAMESPACE ::std::tr1
   #define US_HASH_FUNCTION_NAMESPACE_BEGIN namespace std { namespace tr1 {
   #define US_HASH_FUNCTION_NAMESPACE_END }}
 
 #elif _MSC_VER <= 1500 // Visual Studio 2008 and lower
 
   #include <hash_map>
   #include <hash_set>
   
   #define US_HASH_FUNCTION_BEGIN(type) \
   template<> \
   inline std::size_t hash_value<type>(const type& arg) { 
   
   #define US_HASH_FUNCTION_END }
   
   #define US_HASH_FUNCTION(type, arg) hash_value(arg)
   #define US_HASH_FUNCTION_FRIEND(type) friend std::size_t stdext::hash_value<type>(const type&)
 
   #define US_UNORDERED_MAP_TYPE ::stdext::hash_map
   #define US_UNORDERED_SET_TYPE ::stdext::hash_set
 
   #define US_HASH_FUNCTION_NAMESPACE ::stdext
   #define US_HASH_FUNCTION_NAMESPACE_BEGIN namespace stdext {
   #define US_HASH_FUNCTION_NAMESPACE_END }
 
 #endif
 
 
 //-------------------------------------------------------------------
 // Threading Configuration
 //-------------------------------------------------------------------
 
 #ifdef US_ENABLE_THREADING_SUPPORT
   #define US_DEFAULT_THREADING US_PREPEND_NAMESPACE(MultiThreaded)
 #else
   #define US_DEFAULT_THREADING US_PREPEND_NAMESPACE(SingleThreaded)
 #endif
 
 
 #endif // USCONFIG_H
diff --git a/Core/Code/DataManagement/mitkDataStorage.cpp b/Core/Code/DataManagement/mitkDataStorage.cpp
index 396e6bddea..6e22ebfffc 100644
--- a/Core/Code/DataManagement/mitkDataStorage.cpp
+++ b/Core/Code/DataManagement/mitkDataStorage.cpp
@@ -1,512 +1,512 @@
 /*===================================================================
 
 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 "mitkDataStorage.h"
 
 #include "mitkDataNode.h"
 #include "mitkProperties.h"
 #include "mitkNodePredicateBase.h"
 #include "mitkNodePredicateProperty.h"
 #include "mitkGroupTagProperty.h"
 #include "itkMutexLockHolder.h"
 
 #include "itkCommand.h"
 
 
 mitk::DataStorage::DataStorage() : itk::Object()
 , m_BlockNodeModifiedEvents(false)
 {
 }
 
 
 mitk::DataStorage::~DataStorage()
 {
   ///// we can not call GetAll() in destructor, because it is implemented in a subclass
   //SetOfObjects::ConstPointer all = this->GetAll();
   //for (SetOfObjects::ConstIterator it = all->Begin(); it != all->End(); ++it)
   //  this->RemoveListeners(it->Value());
   //m_NodeModifiedObserverTags.clear();
   //m_NodeDeleteObserverTags.clear();
 }
 
 
 void mitk::DataStorage::Add(mitk::DataNode* node, mitk::DataNode* parent)
 {
   mitk::DataStorage::SetOfObjects::Pointer parents = mitk::DataStorage::SetOfObjects::New();
   parents->InsertElement(0, parent);
   this->Add(node, parents);
 }
 
 
 void mitk::DataStorage::Remove(const mitk::DataStorage::SetOfObjects* nodes)
 {
   if (nodes == NULL)
     return;
   for (mitk::DataStorage::SetOfObjects::ConstIterator it = nodes->Begin(); it != nodes->End(); it++)
     this->Remove(it.Value());
 }
 
 
 mitk::DataStorage::SetOfObjects::ConstPointer mitk::DataStorage::GetSubset(const NodePredicateBase* condition) const
 {
   mitk::DataStorage::SetOfObjects::ConstPointer result = this->FilterSetOfObjects(this->GetAll(), condition);
   return result;
 }
 
 
 mitk::DataNode* mitk::DataStorage::GetNamedNode(const char* name) const
 
 {
   if (name == NULL)
     return NULL;
 
   mitk::StringProperty::Pointer s(mitk::StringProperty::New(name));
   mitk::NodePredicateProperty::Pointer p = mitk::NodePredicateProperty::New("name", s);
   mitk::DataStorage::SetOfObjects::ConstPointer rs = this->GetSubset(p);
   if (rs->Size() >= 1)
     return rs->GetElement(0);
   else
     return NULL;
 }
 
 
 mitk::DataNode* mitk::DataStorage::GetNode(const NodePredicateBase* condition) const
 {
   if (condition == NULL)
     return NULL;
 
   mitk::DataStorage::SetOfObjects::ConstPointer rs = this->GetSubset(condition);
   if (rs->Size() >= 1)
     return rs->GetElement(0);
   else
     return NULL;
 }
 
 mitk::DataNode* mitk::DataStorage::GetNamedDerivedNode(const char* name, const mitk::DataNode* sourceNode, bool onlyDirectDerivations) const
 {
   if (name == NULL)
     return NULL;
 
   mitk::StringProperty::Pointer s(mitk::StringProperty::New(name));
   mitk::NodePredicateProperty::Pointer p = mitk::NodePredicateProperty::New("name", s);
   mitk::DataStorage::SetOfObjects::ConstPointer rs = this->GetDerivations(sourceNode, p, onlyDirectDerivations);
   if (rs->Size() >= 1)
     return rs->GetElement(0);
   else
     return NULL;
 }
 
 
 void mitk::DataStorage::PrintSelf(std::ostream& os, itk::Indent indent) const
 {
   //Superclass::PrintSelf(os, indent);
   mitk::DataStorage::SetOfObjects::ConstPointer all = this->GetAll();
   os << indent << "DataStorage " << this << " is managing " << all->Size() << " objects. List of objects:" << std::endl;
   for (mitk::DataStorage::SetOfObjects::ConstIterator allIt = all->Begin(); allIt != all->End(); allIt++)
   {
     std::string name;
     allIt.Value()->GetName(name);
     std::string datatype;
     if (allIt.Value()->GetData() != NULL)
       datatype = allIt.Value()->GetData()->GetNameOfClass();
     os << indent << " " << allIt.Value().GetPointer() << "<" << datatype << ">: " << name << std::endl;
     mitk::DataStorage::SetOfObjects::ConstPointer parents = this->GetSources(allIt.Value());
     if (parents->Size() > 0)
     {
       os << indent << "  Direct sources: ";
       for (mitk::DataStorage::SetOfObjects::ConstIterator parentIt = parents->Begin(); parentIt != parents->End(); parentIt++)
         os << parentIt.Value().GetPointer() << ", ";
       os << std::endl;
     }
     mitk::DataStorage::SetOfObjects::ConstPointer derivations = this->GetDerivations(allIt.Value());
     if (derivations->Size() > 0)
     {
       os << indent << "  Direct derivations: ";
       for (mitk::DataStorage::SetOfObjects::ConstIterator derivationIt = derivations->Begin(); derivationIt != derivations->End(); derivationIt++)
         os << derivationIt.Value().GetPointer() << ", ";
       os << std::endl;
     }
   }
   os << std::endl;
 }
 
 
 mitk::DataStorage::SetOfObjects::ConstPointer mitk::DataStorage::FilterSetOfObjects(const SetOfObjects* set, const NodePredicateBase* condition) const
 {
   if (set == NULL)
     return NULL;
 
   mitk::DataStorage::SetOfObjects::Pointer result = mitk::DataStorage::SetOfObjects::New();
   for (mitk::DataStorage::SetOfObjects::ConstIterator it = set->Begin(); it != set->End(); it++)
     if (condition == NULL || condition->CheckNode(it.Value()) == true) //alway copy the set, otherwise the iterator in mitk::DataStorage::Remove() will crash
       result->InsertElement(result->Size(), it.Value());
 
   return mitk::DataStorage::SetOfObjects::ConstPointer(result);
 }
 
 
 const mitk::DataNode::GroupTagList mitk::DataStorage::GetGroupTags() const
 {
   DataNode::GroupTagList result;
   SetOfObjects::ConstPointer all = this->GetAll();
   if (all.IsNull())
     return result;
 
   for (mitk::DataStorage::SetOfObjects::ConstIterator nodeIt = all->Begin(); nodeIt != all->End(); nodeIt++)  // for each node
   {
     mitk::PropertyList* pl = nodeIt.Value()->GetPropertyList();
     for (mitk::PropertyList::PropertyMap::const_iterator propIt = pl->GetMap()->begin(); propIt != pl->GetMap()->end(); propIt++)
       if (dynamic_cast<mitk::GroupTagProperty*>(propIt->second.GetPointer()) != NULL)
         result.insert(propIt->first);
   }
 
   return result;
 }
 
 
 void mitk::DataStorage::EmitAddNodeEvent(const mitk::DataNode* node)
 {
   AddNodeEvent.Send(node);
 }
 
 
 void mitk::DataStorage::EmitRemoveNodeEvent(const mitk::DataNode* node)
 {
   RemoveNodeEvent.Send(node);
 }
 
 void mitk::DataStorage::OnNodeModifiedOrDeleted( const itk::Object *caller, const itk::EventObject &event )
 {
   if(m_BlockNodeModifiedEvents)
     return;
 
   const mitk::DataNode* _Node = dynamic_cast<const mitk::DataNode*>(caller);
   if(_Node)
   {
     const itk::ModifiedEvent* modEvent = dynamic_cast<const itk::ModifiedEvent*>(&event);
     if(modEvent)
       ChangedNodeEvent.Send(_Node);
     else
       DeleteNodeEvent.Send(_Node);
   }
 }
 
 
 void mitk::DataStorage::AddListeners( const mitk::DataNode* _Node )
 {
   itk::MutexLockHolder<itk::SimpleFastMutexLock> locked(m_MutexOne);
   // node must not be 0 and must not be yet registered
   mitk::DataNode* NonConstNode = const_cast<mitk::DataNode*>(_Node);
   if(_Node && m_NodeModifiedObserverTags
     .find(NonConstNode) == m_NodeModifiedObserverTags.end())
   {    
     itk::MemberCommand<mitk::DataStorage>::Pointer nodeModifiedCommand =
       itk::MemberCommand<mitk::DataStorage>::New();
     nodeModifiedCommand->SetCallbackFunction(this
                               , &mitk::DataStorage::OnNodeModifiedOrDeleted);
     m_NodeModifiedObserverTags[NonConstNode]
       = NonConstNode->AddObserver(itk::ModifiedEvent(), nodeModifiedCommand);
 
     // add itk delete listener on datastorage
     itk::MemberCommand<mitk::DataStorage>::Pointer deleteCommand =
       itk::MemberCommand<mitk::DataStorage>::New();
     deleteCommand->SetCallbackFunction(this, &mitk::DataStorage::OnNodeModifiedOrDeleted);
     // add observer
     m_NodeDeleteObserverTags[NonConstNode]
         = NonConstNode->AddObserver(itk::DeleteEvent(), deleteCommand);
   }
 }
 
 
 void mitk::DataStorage::RemoveListeners( const mitk::DataNode* _Node )
 {
   itk::MutexLockHolder<itk::SimpleFastMutexLock> locked(m_MutexOne) ;
   // node must not be 0 and must be registered
   mitk::DataNode* NonConstNode = const_cast<mitk::DataNode*>(_Node);
   if(_Node && m_NodeModifiedObserverTags
     .find(NonConstNode) != m_NodeModifiedObserverTags.end())
   {
     // const cast is bad! but sometimes it is necessary. removing an observer does not really
     // touch the internal state
     NonConstNode->RemoveObserver(m_NodeModifiedObserverTags
                                  .find(NonConstNode)->second);
     NonConstNode->RemoveObserver(m_NodeDeleteObserverTags
                                  .find(NonConstNode)->second);
     m_NodeModifiedObserverTags.erase(NonConstNode);
     m_NodeDeleteObserverTags.erase(NonConstNode);
   }
 }
 
 mitk::TimeSlicedGeometry::Pointer mitk::DataStorage::ComputeBoundingGeometry3D( const SetOfObjects* input, const char* boolPropertyKey, mitk::BaseRenderer* renderer, const char* boolPropertyKey2)
 {
   if (input == NULL)
     throw std::invalid_argument("DataStorage: input is invalid");
 
   BoundingBox::PointsContainer::Pointer pointscontainer=BoundingBox::PointsContainer::New();
 
   BoundingBox::PointIdentifier pointid=0;
   Point3D point;
 
   Vector3D minSpacing;
   minSpacing.Fill(ScalarTypeNumericTraits::max());
 
   ScalarType stmin, stmax;
   stmin= ScalarTypeNumericTraits::NonpositiveMin();
   stmax= ScalarTypeNumericTraits::max();
 
   ScalarType minimalIntervallSize = stmax;
   ScalarType minimalTime = stmax;
   ScalarType maximalTime = 0;
 
   // Needed for check of zero bounding boxes
   mitk::ScalarType nullpoint[]={0,0,0,0,0,0};
   BoundingBox::BoundsArrayType itkBoundsZero(nullpoint);
 
   for (SetOfObjects::ConstIterator it = input->Begin(); it != input->End(); ++it)
   {
     DataNode::Pointer node = it->Value();
     if((node.IsNotNull()) && (node->GetData() != NULL) &&
       (node->GetData()->IsEmpty()==false) &&
       node->IsOn(boolPropertyKey, renderer) &&
       node->IsOn(boolPropertyKey2, renderer)
       )
     {
       const TimeSlicedGeometry* geometry = node->GetData()->GetUpdatedTimeSlicedGeometry();
       if (geometry != NULL )
       {
         // bounding box (only if non-zero)
         BoundingBox::BoundsArrayType itkBounds = geometry->GetBoundingBox()->GetBounds();
         if (itkBounds == itkBoundsZero)
         {
           continue;
         }
 
         unsigned char i;
         for(i=0; i<8; ++i)
         {
           point = geometry->GetCornerPoint(i);
           if(point[0]*point[0]+point[1]*point[1]+point[2]*point[2] < large)
             pointscontainer->InsertElement( pointid++, point);
           else
           {
             itkGenericOutputMacro( << "Unrealistically distant corner point encountered. Ignored. Node: " << node );
           }
         }
         // spacing
         try
         {
           AffineTransform3D::Pointer inverseTransform = AffineTransform3D::New();
           geometry->GetIndexToWorldTransform()->GetInverse(inverseTransform);
           vnl_vector< AffineTransform3D::MatrixType::ValueType > unitVector(3);
           int axis;
           for(axis = 0; axis < 3; ++axis)
           {
             unitVector.fill(0);
             unitVector[axis] = 1.0;
             ScalarType mmPerPixel = 1.0/(inverseTransform->GetMatrix()*unitVector).magnitude();
             if(minSpacing[axis] > mmPerPixel)
             {
               minSpacing[axis] = mmPerPixel;
             }
           }
           // time bounds
           // iterate over all time steps
           // Attention: Objects with zero bounding box are not respected in time bound calculation
           TimeBounds minTB = geometry->GetTimeBounds();
           for (unsigned int i=0; i<geometry->GetTimeSteps(); i++)
           {
             const TimeBounds & curTimeBounds = node->GetData()->GetGeometry(i)->GetTimeBounds();
             // get the minimal time of all objects in the DataStorage
             if ((curTimeBounds[0]<minimalTime)&&(curTimeBounds[0]>stmin))
             {
               minimalTime=curTimeBounds[0];
             }
             // get the maximal time of all objects in the DataStorage
             if ((curTimeBounds[1]>maximalTime)&&(curTimeBounds[1]<stmax))
             {
               maximalTime = curTimeBounds[1];
             }
             // get the minimal TimeBound of all time steps of the current DataNode
             if (curTimeBounds[1]-curTimeBounds[0]<minTB[1]-minTB[0])
             {
               minTB = curTimeBounds;
             }
           }
           // get the minimal interval size of all time steps of all objects of the DataStorage
           if (minTB[1]-minTB[0]<minimalIntervallSize)
           {
             minimalIntervallSize = minTB[1]-minTB[0];
           }
         }
         catch(itk::ExceptionObject e)
         {
           MITK_ERROR << e << std::endl;
         }
       }
     }
   }
 
   BoundingBox::Pointer result = BoundingBox::New();
   result->SetPoints(pointscontainer);
   result->ComputeBoundingBox();
 
   // minimal time bounds of a single time step for all geometries
   TimeBounds minTimeBounds;
   minTimeBounds[0] = 0;
   minTimeBounds[1] = 1;
   // compute the number of time steps
   unsigned int numberOfTimeSteps = 1;
   if (maximalTime!=0) // make sure that there is at least one time sliced geometry in the data storage
   {
     minTimeBounds[0] = minimalTime;
     minTimeBounds[1] = minimalTime + minimalIntervallSize;
-    numberOfTimeSteps = (maximalTime-minimalTime)/minimalIntervallSize;
+    numberOfTimeSteps = static_cast<unsigned int>((maximalTime-minimalTime)/minimalIntervallSize);
   }
 
   TimeSlicedGeometry::Pointer timeSlicedGeometry = NULL;
   if ( result->GetPoints()->Size()>0 )
   {
     // Initialize a geometry of a single time step
     Geometry3D::Pointer geometry = Geometry3D::New();
     geometry->Initialize();
     // correct bounding-box (is now in mm, should be in index-coordinates)
     // according to spacing
     BoundingBox::BoundsArrayType bounds = result->GetBounds();
     int i;
     for(i = 0; i < 6; ++i)
     {
       bounds[i] /= minSpacing[i/2];
     }
     geometry->SetBounds(bounds);
     geometry->SetSpacing(minSpacing);
     geometry->SetTimeBounds(minTimeBounds);
     // Initialize the time sliced geometry
     timeSlicedGeometry = TimeSlicedGeometry::New();
     timeSlicedGeometry->InitializeEvenlyTimed(geometry,numberOfTimeSteps);
   }
   return timeSlicedGeometry;
 }
 
 mitk::TimeSlicedGeometry::Pointer mitk::DataStorage::ComputeBoundingGeometry3D( const char* boolPropertyKey, mitk::BaseRenderer* renderer, const char* boolPropertyKey2)
 {
   return this->ComputeBoundingGeometry3D(this->GetAll(), boolPropertyKey, renderer, boolPropertyKey2);
 }
 
 mitk::TimeSlicedGeometry::Pointer mitk::DataStorage::ComputeVisibleBoundingGeometry3D( mitk::BaseRenderer* renderer, const char* boolPropertyKey )
 {
   return ComputeBoundingGeometry3D( "visible", renderer, boolPropertyKey );
 }
 
 
 mitk::BoundingBox::Pointer mitk::DataStorage::ComputeBoundingBox( const char* boolPropertyKey, mitk::BaseRenderer* renderer, const char* boolPropertyKey2)
 {
   BoundingBox::PointsContainer::Pointer pointscontainer=BoundingBox::PointsContainer::New();
 
   BoundingBox::PointIdentifier pointid=0;
   Point3D point;
 
   // Needed for check of zero bounding boxes
   mitk::ScalarType nullpoint[]={0,0,0,0,0,0};
   BoundingBox::BoundsArrayType itkBoundsZero(nullpoint);
 
   SetOfObjects::ConstPointer all = this->GetAll();
   for (SetOfObjects::ConstIterator it = all->Begin(); it != all->End(); ++it)
   {
     DataNode::Pointer node = it->Value();
     if((node.IsNotNull()) && (node->GetData() != NULL) &&
       (node->GetData()->IsEmpty()==false) &&
       node->IsOn(boolPropertyKey, renderer) &&
       node->IsOn(boolPropertyKey2, renderer)
       )
     {
       const Geometry3D* geometry = node->GetData()->GetUpdatedTimeSlicedGeometry();
       if (geometry != NULL )
       {
         // bounding box (only if non-zero)
         BoundingBox::BoundsArrayType itkBounds = geometry->GetBoundingBox()->GetBounds();
         if (itkBounds == itkBoundsZero)
         {
           continue;
         }
 
         unsigned char i;
         for(i=0; i<8; ++i)
         {
           point = geometry->GetCornerPoint(i);
           if(point[0]*point[0]+point[1]*point[1]+point[2]*point[2] < large)
             pointscontainer->InsertElement( pointid++, point);
           else
           {
             itkGenericOutputMacro( << "Unrealistically distant corner point encountered. Ignored. Node: " << node );
           }
         }
       }
     }
 
   }
 
   BoundingBox::Pointer result = BoundingBox::New();
   result->SetPoints(pointscontainer);
   result->ComputeBoundingBox();
 
   return result;
 }
 
 
 mitk::TimeBounds mitk::DataStorage::ComputeTimeBounds( const char* boolPropertyKey, mitk::BaseRenderer* renderer, const char* boolPropertyKey2)
 {
   TimeBounds timeBounds;
 
   ScalarType stmin, stmax, cur;
 
   stmin= ScalarTypeNumericTraits::NonpositiveMin();
   stmax= ScalarTypeNumericTraits::max();
 
   timeBounds[0]=stmax; timeBounds[1]=stmin;
 
   SetOfObjects::ConstPointer all = this->GetAll();
   for (SetOfObjects::ConstIterator it = all->Begin(); it != all->End(); ++it)
   {
     DataNode::Pointer node = it->Value();
     if((node.IsNotNull()) && (node->GetData() != NULL) &&
       (node->GetData()->IsEmpty()==false) &&
       node->IsOn(boolPropertyKey, renderer) &&
       node->IsOn(boolPropertyKey2, renderer)
       )
     {
       const Geometry3D* geometry = node->GetData()->GetUpdatedTimeSlicedGeometry();
       if (geometry != NULL )
       {
         const TimeBounds & curTimeBounds = geometry->GetTimeBounds();
         cur=curTimeBounds[0];
         //is it after -infinity, but before everything else that we found until now?
         if((cur > stmin) && (cur < timeBounds[0]))
           timeBounds[0] = cur;
 
         cur=curTimeBounds[1];
         //is it before infinity, but after everything else that we found until now?
         if((cur < stmax) && (cur > timeBounds[1]))
           timeBounds[1] = cur;
       }
     }
   }
   if(!(timeBounds[0] < stmax))
   {
     timeBounds[0] = stmin;
     timeBounds[1] = stmax;
   }
   return timeBounds;
 }
diff --git a/Core/Code/DataManagement/mitkImage.cpp b/Core/Code/DataManagement/mitkImage.cpp
index a9f31623dd..397e027b78 100644
--- a/Core/Code/DataManagement/mitkImage.cpp
+++ b/Core/Code/DataManagement/mitkImage.cpp
@@ -1,1278 +1,1280 @@
 /*===================================================================
 
 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 "mitkImage.h"
 
 #include "mitkImageStatisticsHolder.h"
 #include "mitkPixelTypeMultiplex.h"
 
 #include <vtkImageData.h>
 
+#include <cmath>
+
 #define FILL_C_ARRAY( _arr, _size, _value) for(unsigned int i=0u; i<_size; i++) \
 { _arr[i] = _value; }
 
 
 mitk::Image::Image() : 
 m_Dimension(0), m_Dimensions(NULL), m_ImageDescriptor(NULL), m_OffsetTable(NULL), m_CompleteData(NULL),
   m_ImageStatistics(NULL)
 {
    m_Dimensions = new unsigned int[MAX_IMAGE_DIMENSIONS];
    FILL_C_ARRAY( m_Dimensions, MAX_IMAGE_DIMENSIONS, 0u);
 
    m_Initialized = false;
 }
 
 mitk::Image::Image(const Image &other) : SlicedData(other), m_Dimension(0), m_Dimensions(NULL),
 m_ImageDescriptor(NULL), m_OffsetTable(NULL), m_CompleteData(NULL), m_ImageStatistics(NULL)
 {
   m_Dimensions = new unsigned int[MAX_IMAGE_DIMENSIONS];
   FILL_C_ARRAY( m_Dimensions, MAX_IMAGE_DIMENSIONS, 0u);
 
   this->Initialize( other.GetPixelType(), other.GetDimension(), other.GetDimensions());
 
   //Since the above called "Initialize" method doesn't take the geometry into account we need to set it
   //here manually
   this->SetGeometry(dynamic_cast<mitk::Geometry3D*>(other.GetGeometry()->Clone().GetPointer()));
 
   if (this->GetDimension() > 3)
   {
     const unsigned int time_steps = this->GetDimension(3);
 
     for (unsigned int i = 0u; i < time_steps; ++i)
     {
       ImageDataItemPointer volume = const_cast<Image&>(other).GetVolumeData(i);
 
       this->SetVolume(volume->GetData(), i);
     }
   }
   else
   {
     ImageDataItemPointer volume = const_cast<Image&>(other).GetVolumeData(0);
 
     this->SetVolume(volume->GetData(), 0);
   }
 }
 
 mitk::Image::~Image()
 {
   Clear();
   m_ReferenceCountLock.Lock();
   m_ReferenceCount = 3;
   m_ReferenceCountLock.Unlock();
   m_ReferenceCountLock.Lock();
   m_ReferenceCount = 0;
   m_ReferenceCountLock.Unlock();
   if(m_OffsetTable != NULL)
     delete [] m_OffsetTable;
 
   if(m_ImageStatistics != NULL)
     delete m_ImageStatistics;
 }
 
 const mitk::PixelType mitk::Image::GetPixelType(int n) const
 {
   return this->m_ImageDescriptor->GetChannelTypeById(n);
 }
 
 unsigned int mitk::Image::GetDimension() const
 {
   return m_Dimension;
 }
 
 unsigned int mitk::Image::GetDimension(int i) const
 {
   if((i>=0) && (i<(int)m_Dimension))
     return m_Dimensions[i];
   return 1;
 }
 
 void* mitk::Image::GetData()
 {
   if(m_Initialized==false)
   {
     if(GetSource().IsNull())
       return NULL;
     if(GetSource()->Updating()==false)
       GetSource()->UpdateOutputInformation();
   }
   m_CompleteData=GetChannelData();
 
   // update channel's data
   // if data was not available at creation point, the m_Data of channel descriptor is NULL
   // if data present, it won't be overwritten
   m_ImageDescriptor->GetChannelDescriptor(0).SetData(m_CompleteData->GetData());
 
   return m_CompleteData->GetData();
 }
 
 
 template <class T>
 void AccessPixel( const mitk::PixelType ptype, void* data, const unsigned int offset, double& value )
 {
   value = 0.0;
   if( data == NULL ) return;
 
   if(ptype.GetBpe() != 24)
   {
     value = (double) (((T*) data)[ offset ]);
  }
   else
   {
     const unsigned int rgboffset = 3 * offset;
 
     double returnvalue = (((T*) data)[rgboffset ]);
     returnvalue += (((T*) data)[rgboffset + 1]);
     returnvalue += (((T*) data)[rgboffset + 2]);
     value = returnvalue;
   }
 
 }
 
 double mitk::Image::GetPixelValueByIndex(const mitk::Index3D &position, unsigned int timestep)
 {
   double value = 0;
   if (this->GetTimeSteps() < timestep)
   {
     timestep = this->GetTimeSteps();
   }
 
   value = 0.0;
 
   const unsigned int* imageDims = this->m_ImageDescriptor->GetDimensions();
   const mitk::PixelType ptype = this->m_ImageDescriptor->GetChannelTypeById(0);
 
   // Comparison ?>=0 not needed since all position[i] and timestep are unsigned int
   // (position[0]>=0 && position[1] >=0 && position[2]>=0 && timestep>=0)
   // &&
   if ( (unsigned int)position[0] < imageDims[0] && (unsigned int)position[1] < imageDims[1] &&
        ( (imageDims[2] == 0) || (unsigned int)position[2] < imageDims[2]) // in case a 2D Image passed in, the third dimension could be set to 0 causing the if() to fail
     /*&& (unsigned int)timestep < imageDims[3]*/ )
   {
     const unsigned int offset = position[0] + position[1]*imageDims[0] + position[2]*imageDims[0]*imageDims[1] + timestep*imageDims[0]*imageDims[1]*imageDims[2];
 
     mitkPixelTypeMultiplex3( AccessPixel, ptype, this->GetData(), offset, value );
   }
 
   return value;
 }
 
 double mitk::Image::GetPixelValueByWorldCoordinate(const mitk::Point3D& position, unsigned int timestep)
 {
   double value = 0.0;
   if (this->GetTimeSteps() < timestep)
   {
     timestep = this->GetTimeSteps();
   }
 
   Index3D itkIndex;
   this->GetGeometry()->WorldToIndex(position, itkIndex);
 
   const unsigned int* imageDims = this->m_ImageDescriptor->GetDimensions();
   const mitk::PixelType ptype = this->m_ImageDescriptor->GetChannelTypeById(0);
 
   //if ( (itkIndex[0]>=0 && itkIndex[1] >=0 && itkIndex[2]>=0 && timestep>=0)
   //     &&
   // lines above taken from comparison since always true due to unsigned type
   if (((unsigned int)itkIndex[0] < imageDims[0] && 
         (unsigned int)itkIndex[1] < imageDims[1] &&
           (imageDims[2] == 0) ) || ((unsigned int)itkIndex[2] < imageDims[2])) // in case a 2D Image passed in, the third dimension could be set to 0 causing the if() to fail
   {
     const unsigned int offset = itkIndex[0] + itkIndex[1]*imageDims[0] + itkIndex[2]*imageDims[0]*imageDims[1] + timestep*imageDims[0]*imageDims[1]*imageDims[2];
 
     mitkPixelTypeMultiplex3( AccessPixel, ptype, this->GetData(), offset, value );
   }
 
   return value;
 }
 
 vtkImageData* mitk::Image::GetVtkImageData(int t, int n)
 {
   if(m_Initialized==false)
   {
     if(GetSource().IsNull())
       return NULL;
     if(GetSource()->Updating()==false)
       GetSource()->UpdateOutputInformation();
   }
   ImageDataItemPointer volume=GetVolumeData(t, n);
   if(volume.GetPointer()==NULL || volume->GetVtkImageData() == NULL)
     return NULL;
 
 
   float *fspacing = const_cast<float *>(GetSlicedGeometry(t)->GetFloatSpacing());
   double dspacing[3] = {fspacing[0],fspacing[1],fspacing[2]};
   volume->GetVtkImageData()->SetSpacing( dspacing );
 
   return volume->GetVtkImageData();
 }
 
 mitk::Image::ImageDataItemPointer mitk::Image::GetSliceData(int s, int t, int n, void *data, ImportMemoryManagementType importMemoryManagement)
 {
   if(IsValidSlice(s,t,n)==false) return NULL;
 
   const size_t ptypeSize = this->m_ImageDescriptor->GetChannelTypeById(n).GetSize();
 
   // slice directly available?
   int pos=GetSliceIndex(s,t,n);
   if(m_Slices[pos].GetPointer()!=NULL)
     return m_Slices[pos];
 
   // is slice available as part of a volume that is available?
   ImageDataItemPointer sl, ch, vol;
   vol=m_Volumes[GetVolumeIndex(t,n)];
   if((vol.GetPointer()!=NULL) && (vol->IsComplete()))
   {
     sl=new ImageDataItem(*vol, m_ImageDescriptor, 2, data, importMemoryManagement == ManageMemory, ((size_t) s)*m_OffsetTable[2]*(ptypeSize));
     sl->SetComplete(true);
     return m_Slices[pos]=sl;
   }
 
   // is slice available as part of a channel that is available?
   ch=m_Channels[n];
   if((ch.GetPointer()!=NULL) && (ch->IsComplete()))
   {
     sl=new ImageDataItem(*ch, m_ImageDescriptor, 2, data, importMemoryManagement == ManageMemory, (((size_t) s)*m_OffsetTable[2]+((size_t) t)*m_OffsetTable[3])*(ptypeSize));
     sl->SetComplete(true);
     return m_Slices[pos]=sl;
   }
 
   // slice is unavailable. Can we calculate it?
   if((GetSource().IsNotNull()) && (GetSource()->Updating()==false))
   {
     // ... wir mussen rechnen!!! ....
     m_RequestedRegion.SetIndex(0, 0);
     m_RequestedRegion.SetIndex(1, 0);
     m_RequestedRegion.SetIndex(2, s);
     m_RequestedRegion.SetIndex(3, t);
     m_RequestedRegion.SetIndex(4, n);
     m_RequestedRegion.SetSize(0, m_Dimensions[0]);
     m_RequestedRegion.SetSize(1, m_Dimensions[1]);
     m_RequestedRegion.SetSize(2, 1);
     m_RequestedRegion.SetSize(3, 1);
     m_RequestedRegion.SetSize(4, 1);
     m_RequestedRegionInitialized=true;
     GetSource()->Update();
     if(IsSliceSet(s,t,n))
       //yes: now we can call ourselves without the risk of a endless loop (see "if" above)
       return GetSliceData(s,t,n,data,importMemoryManagement);
     else
       return NULL;
   }
   else
   {
     ImageDataItemPointer item = AllocateSliceData(s,t,n,data,importMemoryManagement);
     item->SetComplete(true);
     return item;
   }
 }
 
 mitk::Image::ImageDataItemPointer mitk::Image::GetVolumeData(int t, int n, void *data, ImportMemoryManagementType importMemoryManagement)
 {
   if(IsValidVolume(t,n)==false) return NULL;
 
   ImageDataItemPointer ch, vol;
 
   // volume directly available?
   int pos=GetVolumeIndex(t,n);
   vol=m_Volumes[pos];
   if((vol.GetPointer()!=NULL) && (vol->IsComplete()))
     return vol;
 
   const size_t ptypeSize = this->m_ImageDescriptor->GetChannelTypeById(n).GetSize();
 
   // is volume available as part of a channel that is available?
   ch=m_Channels[n];
   if((ch.GetPointer()!=NULL) && (ch->IsComplete()))
   {
     vol=new ImageDataItem(*ch, m_ImageDescriptor, 3, data, importMemoryManagement == ManageMemory, (((size_t) t)*m_OffsetTable[3])*(ptypeSize));
     vol->SetComplete(true);
     return m_Volumes[pos]=vol;
   }
 
   // let's see if all slices of the volume are set, so that we can (could) combine them to a volume
   bool complete=true;
   unsigned int s;
   for(s=0;s<m_Dimensions[2];++s)
   {
     if(m_Slices[GetSliceIndex(s,t,n)].GetPointer()==NULL)
     {
       complete=false;
       break;
     }
   }
   if(complete)
   {
     // if there is only single slice we do not need to combine anything
     if(m_Dimensions[2]<=1)
     {
       ImageDataItemPointer sl;
       sl=GetSliceData(0,t,n,data,importMemoryManagement);
       vol=new ImageDataItem(*sl, m_ImageDescriptor, 3, data, importMemoryManagement == ManageMemory);
       vol->SetComplete(true);
     }
     else
     {
       mitk::PixelType chPixelType = this->m_ImageDescriptor->GetChannelTypeById(n);
 
       vol=m_Volumes[pos];
       // ok, let's combine the slices!
       if(vol.GetPointer()==NULL)
         vol=new ImageDataItem( chPixelType, 3, m_Dimensions, NULL, true);
       vol->SetComplete(true);
       size_t size=m_OffsetTable[2]*(ptypeSize);
       for(s=0;s<m_Dimensions[2];++s)
       {
         int posSl;
         ImageDataItemPointer sl;
         posSl=GetSliceIndex(s,t,n);
 
         sl=m_Slices[posSl];
         if(sl->GetParent()!=vol)
         {
           // copy data of slices in volume
           size_t offset = ((size_t) s)*size;
           std::memcpy(static_cast<char*>(vol->GetData())+offset, sl->GetData(), size);
 
           // FIXME mitkIpPicDescriptor * pic = sl->GetPicDescriptor();
 
           // replace old slice with reference to volume
           sl=new ImageDataItem(*vol, m_ImageDescriptor, 2, data, importMemoryManagement == ManageMemory, ((size_t) s)*size);
           sl->SetComplete(true);
           //mitkIpFuncCopyTags(sl->GetPicDescriptor(), pic);
           m_Slices[posSl]=sl;
         }
       }
       //if(vol->GetPicDescriptor()->info->tags_head==NULL)
       //  mitkIpFuncCopyTags(vol->GetPicDescriptor(), m_Slices[GetSliceIndex(0,t,n)]->GetPicDescriptor());
     }
     return m_Volumes[pos]=vol;
   }
 
   // volume is unavailable. Can we calculate it?
   if((GetSource().IsNotNull()) && (GetSource()->Updating()==false))
   {
     // ... wir muessen rechnen!!! ....
     m_RequestedRegion.SetIndex(0, 0);
     m_RequestedRegion.SetIndex(1, 0);
     m_RequestedRegion.SetIndex(2, 0);
     m_RequestedRegion.SetIndex(3, t);
     m_RequestedRegion.SetIndex(4, n);
     m_RequestedRegion.SetSize(0, m_Dimensions[0]);
     m_RequestedRegion.SetSize(1, m_Dimensions[1]);
     m_RequestedRegion.SetSize(2, m_Dimensions[2]);
     m_RequestedRegion.SetSize(3, 1);
     m_RequestedRegion.SetSize(4, 1);
     m_RequestedRegionInitialized=true;
     GetSource()->Update();
     if(IsVolumeSet(t,n))
       //yes: now we can call ourselves without the risk of a endless loop (see "if" above)
       return GetVolumeData(t,n,data,importMemoryManagement);
     else
       return NULL;
   }
   else
   {
     ImageDataItemPointer item = AllocateVolumeData(t,n,data,importMemoryManagement);
     item->SetComplete(true);
     return item;
   }
 
 }
 
 mitk::Image::ImageDataItemPointer mitk::Image::GetChannelData(int n, void *data, ImportMemoryManagementType importMemoryManagement)
 {
   if(IsValidChannel(n)==false) return NULL;
   ImageDataItemPointer ch, vol;
   ch=m_Channels[n];
   if((ch.GetPointer()!=NULL) && (ch->IsComplete()))
     return ch;
 
   // let's see if all volumes are set, so that we can (could) combine them to a channel
   if(IsChannelSet(n))
   {
     // if there is only one time frame we do not need to combine anything
     if(m_Dimensions[3]<=1)
     {
       vol=GetVolumeData(0,n,data,importMemoryManagement);
       ch=new ImageDataItem(*vol, m_ImageDescriptor, m_ImageDescriptor->GetNumberOfDimensions(), data, importMemoryManagement == ManageMemory);
       ch->SetComplete(true);
     }
     else
     {
       const size_t ptypeSize = this->m_ImageDescriptor->GetChannelTypeById(n).GetSize();
 
       ch=m_Channels[n];
       // ok, let's combine the volumes!
       if(ch.GetPointer()==NULL)
         ch=new ImageDataItem(this->m_ImageDescriptor, NULL, true);
       ch->SetComplete(true);
       size_t size=m_OffsetTable[m_Dimension-1]*(ptypeSize);
       unsigned int t;
       ImageDataItemPointerArray::iterator slicesIt = m_Slices.begin()+n*m_Dimensions[2]*m_Dimensions[3];
       for(t=0;t<m_Dimensions[3];++t)
       {
         int posVol;
         ImageDataItemPointer vol;
 
         posVol=GetVolumeIndex(t,n);
         vol=GetVolumeData(t,n,data,importMemoryManagement);
 
         if(vol->GetParent()!=ch)
         {
           // copy data of volume in channel
           size_t offset = ((size_t) t)*m_OffsetTable[3]*(ptypeSize);
           std::memcpy(static_cast<char*>(ch->GetData())+offset, vol->GetData(), size);
 
           // REVEIW FIX mitkIpPicDescriptor * pic = vol->GetPicDescriptor();
 
           // replace old volume with reference to channel
           vol=new ImageDataItem(*ch, m_ImageDescriptor, 3, data, importMemoryManagement == ManageMemory, offset);
           vol->SetComplete(true);
           //mitkIpFuncCopyTags(vol->GetPicDescriptor(), pic);
 
           m_Volumes[posVol]=vol;
 
           // get rid of slices - they may point to old volume
           ImageDataItemPointer dnull=NULL;
           for(unsigned int i = 0; i < m_Dimensions[2]; ++i, ++slicesIt)
           {
             assert(slicesIt != m_Slices.end());
             *slicesIt = dnull;
           }
         }
       }
    // REVIEW FIX
    //   if(ch->GetPicDescriptor()->info->tags_head==NULL)
    //     mitkIpFuncCopyTags(ch->GetPicDescriptor(), m_Volumes[GetVolumeIndex(0,n)]->GetPicDescriptor());
     }
     return m_Channels[n]=ch;
   }
 
   // channel is unavailable. Can we calculate it?
   if((GetSource().IsNotNull()) && (GetSource()->Updating()==false))
   {
     // ... wir muessen rechnen!!! ....
     m_RequestedRegion.SetIndex(0, 0);
     m_RequestedRegion.SetIndex(1, 0);
     m_RequestedRegion.SetIndex(2, 0);
     m_RequestedRegion.SetIndex(3, 0);
     m_RequestedRegion.SetIndex(4, n);
     m_RequestedRegion.SetSize(0, m_Dimensions[0]);
     m_RequestedRegion.SetSize(1, m_Dimensions[1]);
     m_RequestedRegion.SetSize(2, m_Dimensions[2]);
     m_RequestedRegion.SetSize(3, m_Dimensions[3]);
     m_RequestedRegion.SetSize(4, 1);
     m_RequestedRegionInitialized=true;
     GetSource()->Update();
     // did it work?
     if(IsChannelSet(n))
       //yes: now we can call ourselves without the risk of a endless loop (see "if" above)
       return GetChannelData(n,data,importMemoryManagement);
     else
       return NULL;
   }
   else
   {
     ImageDataItemPointer item = AllocateChannelData(n,data,importMemoryManagement);
     item->SetComplete(true);
     return item;
   }
 }
 
 bool mitk::Image::IsSliceSet(int s, int t, int n) const
 {
   if(IsValidSlice(s,t,n)==false) return false;
 
   if(m_Slices[GetSliceIndex(s,t,n)].GetPointer()!=NULL)
     return true;
 
   ImageDataItemPointer ch, vol;
   vol=m_Volumes[GetVolumeIndex(t,n)];
   if((vol.GetPointer()!=NULL) && (vol->IsComplete()))
     return true;
   ch=m_Channels[n];
   if((ch.GetPointer()!=NULL) && (ch->IsComplete()))
     return true;
   return false;
 }
 
 bool mitk::Image::IsVolumeSet(int t, int n) const
 {
   if(IsValidVolume(t,n)==false) return false;
   ImageDataItemPointer ch, vol;
 
   // volume directly available?
   vol=m_Volumes[GetVolumeIndex(t,n)];
   if((vol.GetPointer()!=NULL) && (vol->IsComplete()))
     return true;
 
   // is volume available as part of a channel that is available?
   ch=m_Channels[n];
   if((ch.GetPointer()!=NULL) && (ch->IsComplete()))
     return true;
 
   // let's see if all slices of the volume are set, so that we can (could) combine them to a volume
   unsigned int s;
   for(s=0;s<m_Dimensions[2];++s)
     if(m_Slices[GetSliceIndex(s,t,n)].GetPointer()==NULL)
       return false;
   return true;
 }
 
 bool mitk::Image::IsChannelSet(int n) const
 {
   if(IsValidChannel(n)==false) return false;
   ImageDataItemPointer ch, vol;
   ch=m_Channels[n];
   if((ch.GetPointer()!=NULL) && (ch->IsComplete()))
 
     return true;
   // let's see if all volumes are set, so that we can (could) combine them to a channel
   unsigned int t;
   for(t=0;t<m_Dimensions[3];++t)
     if(IsVolumeSet(t,n)==false)
       return false;
   return true;
 }
 
 bool mitk::Image::SetSlice(const void *data, int s, int t, int n)
 {
   // const_cast is no risk for ImportMemoryManagementType == CopyMemory
   return SetImportSlice(const_cast<void*>(data), s, t, n, CopyMemory);
 }
 
 bool mitk::Image::SetVolume(const void *data, int t, int n)
 {
   // const_cast is no risk for ImportMemoryManagementType == CopyMemory
   return SetImportVolume(const_cast<void*>(data), t, n, CopyMemory);
 }
 
 bool mitk::Image::SetChannel(const void *data, int n)
 {
   // const_cast is no risk for ImportMemoryManagementType == CopyMemory
   return SetImportChannel(const_cast<void*>(data), n, CopyMemory);
 }
 
 bool mitk::Image::SetImportSlice(void *data, int s, int t, int n, ImportMemoryManagementType importMemoryManagement)
 {
   if(IsValidSlice(s,t,n)==false) return false;
   ImageDataItemPointer sl;
   const size_t ptypeSize = this->m_ImageDescriptor->GetChannelTypeById(n).GetSize();
 
   if(IsSliceSet(s,t,n))
   {
     sl=GetSliceData(s,t,n,data,importMemoryManagement);
     if(sl->GetManageMemory()==false)
     {
       sl=AllocateSliceData(s,t,n,data,importMemoryManagement);
       if(sl.GetPointer()==NULL) return false;
     }
     if ( sl->GetData() != data )
       std::memcpy(sl->GetData(), data, m_OffsetTable[2]*(ptypeSize));
     sl->Modified();
     //we have changed the data: call Modified()! 
     Modified();
   }
   else
   {
     sl=AllocateSliceData(s,t,n,data,importMemoryManagement);
     if(sl.GetPointer()==NULL) return false;
     if ( sl->GetData() != data )
       std::memcpy(sl->GetData(), data, m_OffsetTable[2]*(ptypeSize));
     //we just added a missing slice, which is not regarded as modification.
     //Therefore, we do not call Modified()!
   }
   return true;
 }
 
 bool mitk::Image::SetImportVolume(void *data, int t, int n, ImportMemoryManagementType importMemoryManagement)
 {
   if(IsValidVolume(t,n)==false) return false;
 
   const size_t ptypeSize = this->m_ImageDescriptor->GetChannelTypeById(n).GetSize();
   ImageDataItemPointer vol;
   if(IsVolumeSet(t,n))
   {
     vol=GetVolumeData(t,n,data,importMemoryManagement);
     if(vol->GetManageMemory()==false)
     {
       vol=AllocateVolumeData(t,n,data,importMemoryManagement);
       if(vol.GetPointer()==NULL) return false;
     }
     if ( vol->GetData() != data )
       std::memcpy(vol->GetData(), data, m_OffsetTable[3]*(ptypeSize));
     vol->Modified();
     vol->SetComplete(true);
     //we have changed the data: call Modified()! 
     Modified();
   }
   else
   {
     vol=AllocateVolumeData(t,n,data,importMemoryManagement);
     if(vol.GetPointer()==NULL) return false;
     if ( vol->GetData() != data )
     { 
       std::memcpy(vol->GetData(), data, m_OffsetTable[3]*(ptypeSize));
     }
     vol->SetComplete(true);
     this->m_ImageDescriptor->GetChannelDescriptor(n).SetData( vol->GetData() );
     //we just added a missing Volume, which is not regarded as modification.
     //Therefore, we do not call Modified()!
   }
   return true;
 }
 
 bool mitk::Image::SetImportChannel(void *data, int n, ImportMemoryManagementType importMemoryManagement)
 {
   if(IsValidChannel(n)==false) return false;
 
   // channel descriptor
 
   const size_t ptypeSize = this->m_ImageDescriptor->GetChannelTypeById(n).GetSize();
 
   ImageDataItemPointer ch;
   if(IsChannelSet(n))
   {  
     ch=GetChannelData(n,data,importMemoryManagement);
     if(ch->GetManageMemory()==false)
     {
       ch=AllocateChannelData(n,data,importMemoryManagement);
       if(ch.GetPointer()==NULL) return false;
     }
     if ( ch->GetData() != data )
       std::memcpy(ch->GetData(), data, m_OffsetTable[4]*(ptypeSize));
     ch->Modified();
     ch->SetComplete(true);
     //we have changed the data: call Modified()! 
     Modified();
   }
   else
   {
     ch=AllocateChannelData(n,data,importMemoryManagement);
     if(ch.GetPointer()==NULL) return false;
     if ( ch->GetData() != data )
       std::memcpy(ch->GetData(), data, m_OffsetTable[4]*(ptypeSize));
     ch->SetComplete(true);
 
     this->m_ImageDescriptor->GetChannelDescriptor(n).SetData( ch->GetData() );
     //we just added a missing Channel, which is not regarded as modification.
     //Therefore, we do not call Modified()!
   }
   return true;
 }
 
 void mitk::Image::Initialize()
 {
   ImageDataItemPointerArray::iterator it, end;
   for( it=m_Slices.begin(), end=m_Slices.end(); it!=end; ++it )
   {
     (*it)=NULL;
   }
   for( it=m_Volumes.begin(), end=m_Volumes.end(); it!=end; ++it )
   {
     (*it)=NULL;
   }
   for( it=m_Channels.begin(), end=m_Channels.end(); it!=end; ++it )
   {
     (*it)=NULL;
   }
   m_CompleteData = NULL;
  
   if( m_ImageStatistics == NULL)
   {
     m_ImageStatistics = new mitk::ImageStatisticsHolder( this );
   }
 
   SetRequestedRegionToLargestPossibleRegion();
 }
 
 void mitk::Image::Initialize(const mitk::ImageDescriptor::Pointer inDesc)
 {
   // store the descriptor
   this->m_ImageDescriptor = inDesc;
 
   // initialize image
   this->Initialize( inDesc->GetChannelDescriptor(0).GetPixelType(), inDesc->GetNumberOfDimensions(), inDesc->GetDimensions(), 1 );
 }
 
 void mitk::Image::Initialize(const mitk::PixelType& type, unsigned int dimension, const unsigned int *dimensions, unsigned int channels)
 {
   Clear();
 
   m_Dimension=dimension;
 
   if(!dimensions)
     itkExceptionMacro(<< "invalid zero dimension image");
 
   unsigned int i;
   for(i=0;i<dimension;++i)
   {
     if(dimensions[i]<1)
       itkExceptionMacro(<< "invalid dimension[" << i << "]: " << dimensions[i]);
   }
 
   // create new array since the old was deleted
   m_Dimensions = new unsigned int[MAX_IMAGE_DIMENSIONS];
 
   // initialize the first four dimensions to 1, the remaining 4 to 0
   FILL_C_ARRAY(m_Dimensions, 4, 1u);
   FILL_C_ARRAY((m_Dimensions+4), 4, 0u);
 
   // copy in the passed dimension information
   std::memcpy(m_Dimensions, dimensions, sizeof(unsigned int)*m_Dimension);
 
   this->m_ImageDescriptor = mitk::ImageDescriptor::New();
   this->m_ImageDescriptor->Initialize( this->m_Dimensions, this->m_Dimension );
 
   for(i=0;i<4;++i)
   {
     m_LargestPossibleRegion.SetIndex(i, 0);
     m_LargestPossibleRegion.SetSize (i, m_Dimensions[i]);
   }
   m_LargestPossibleRegion.SetIndex(i, 0);
   m_LargestPossibleRegion.SetSize(i, channels);
 
   if(m_LargestPossibleRegion.GetNumberOfPixels()==0)
   {
     delete [] m_Dimensions;
     m_Dimensions = NULL;
     return;
   }
 
   for( unsigned int i=0u; i<channels; i++)
   {
     this->m_ImageDescriptor->AddNewChannel( type );
   }
 
   PlaneGeometry::Pointer planegeometry = PlaneGeometry::New();
   planegeometry->InitializeStandardPlane(m_Dimensions[0], m_Dimensions[1]);
 
   SlicedGeometry3D::Pointer slicedGeometry = SlicedGeometry3D::New();
   slicedGeometry->InitializeEvenlySpaced(planegeometry, m_Dimensions[2]);
 
   if(dimension>=4)
   {
     TimeBounds timebounds;
     timebounds[0] = 0.0;
     timebounds[1] = 1.0;
     slicedGeometry->SetTimeBounds(timebounds);
   }
 
   TimeSlicedGeometry::Pointer timeSliceGeometry = TimeSlicedGeometry::New();
   timeSliceGeometry->InitializeEvenlyTimed(slicedGeometry, m_Dimensions[3]);
   timeSliceGeometry->ImageGeometryOn();
 
   SetGeometry(timeSliceGeometry);
 
   ImageDataItemPointer dnull=NULL;
 
   m_Channels.assign(GetNumberOfChannels(), dnull);
 
   m_Volumes.assign(GetNumberOfChannels()*m_Dimensions[3], dnull);
 
   m_Slices.assign(GetNumberOfChannels()*m_Dimensions[3]*m_Dimensions[2], dnull);
 
   ComputeOffsetTable();
 
   Initialize();
 
   m_Initialized = true;
 }
 
 void mitk::Image::Initialize(const mitk::PixelType& type, const mitk::Geometry3D& geometry, unsigned int channels, int tDim ) 
 {
   unsigned int dimensions[5];
   dimensions[0] = (unsigned int)(geometry.GetExtent(0)+0.5);
   dimensions[1] = (unsigned int)(geometry.GetExtent(1)+0.5);
   dimensions[2] = (unsigned int)(geometry.GetExtent(2)+0.5);
   dimensions[3] = 0;
   dimensions[4] = 0;
 
   unsigned int dimension = 2;
   if ( dimensions[2] > 1 )
     dimension = 3;
 
   if ( tDim > 0)
   {
     dimensions[3] = tDim;
   }
   else
   {
     const mitk::TimeSlicedGeometry* timeGeometry = dynamic_cast<const mitk::TimeSlicedGeometry*>(&geometry);
     if ( timeGeometry != NULL ) 
     {
       dimensions[3] = timeGeometry->GetTimeSteps();
     }
   }
 
   if ( dimensions[3] > 1 )
     dimension = 4;
 
   Initialize( type, dimension, dimensions, channels );
 
   SetGeometry(static_cast<Geometry3D*>(geometry.Clone().GetPointer()));
   
   mitk::BoundingBox::BoundsArrayType bounds = geometry.GetBoundingBox()->GetBounds();
   if( (bounds[0] != 0.0) || (bounds[2] != 0.0) || (bounds[4] != 0.0) )
   {
     SlicedGeometry3D* slicedGeometry = GetSlicedGeometry(0);
   
     mitk::Point3D origin; origin.Fill(0.0);
     slicedGeometry->IndexToWorld(origin, origin);
 
     bounds[1]-=bounds[0]; bounds[3]-=bounds[2]; bounds[5]-=bounds[4];
     bounds[0] = 0.0;      bounds[2] = 0.0;      bounds[4] = 0.0;
 this->m_ImageDescriptor->Initialize( this->m_Dimensions, this->m_Dimension );
     slicedGeometry->SetBounds(bounds);
     slicedGeometry->GetIndexToWorldTransform()->SetOffset(origin.Get_vnl_vector().data_block());  
   
     GetTimeSlicedGeometry()->InitializeEvenlyTimed(slicedGeometry, m_Dimensions[3]);
   }
 }
 
 void mitk::Image::Initialize(const mitk::PixelType& type, int sDim, const mitk::Geometry2D& geometry2d, bool flipped, unsigned int channels, int tDim )
 {
   SlicedGeometry3D::Pointer slicedGeometry = SlicedGeometry3D::New();
   slicedGeometry->InitializeEvenlySpaced(static_cast<Geometry2D*>(geometry2d.Clone().GetPointer()), sDim, flipped);
   Initialize(type, *slicedGeometry, channels, tDim);
 }
 
 void mitk::Image::Initialize(const mitk::Image* image) 
 {
   Initialize(image->GetPixelType(), *image->GetTimeSlicedGeometry());
 }
 
 void mitk::Image::Initialize(vtkImageData* vtkimagedata, int channels, int tDim, int sDim)
 {
   if(vtkimagedata==NULL) return;
 
   m_Dimension=vtkimagedata->GetDataDimension();
   unsigned int i, *tmpDimensions=new unsigned int[m_Dimension>4?m_Dimension:4];
   for(i=0;i<m_Dimension;++i) tmpDimensions[i]=vtkimagedata->GetDimensions()[i];
   if(m_Dimension<4)
   {
     unsigned int *p;
     for(i=0,p=tmpDimensions+m_Dimension;i<4-m_Dimension;++i, ++p)
       *p=1;
   }
 
   if(sDim>=0)
   {
     tmpDimensions[2]=sDim;
     if(m_Dimension < 3)
       m_Dimension = 3;
   }
   if(tDim>=0)
   {
     tmpDimensions[3]=tDim;
     if(m_Dimension < 4)
       m_Dimension = 4;
   }
 
 
   switch ( vtkimagedata->GetScalarType() ) 
   {
   case VTK_BIT: 
   case VTK_CHAR: 
     //pixelType.Initialize(typeid(char), vtkimagedata->GetNumberOfScalarComponents());
     Initialize(mitk::MakeScalarPixelType<char>(), m_Dimension, tmpDimensions, channels);
     break;
   case VTK_UNSIGNED_CHAR: 
     //pixelType.Initialize(typeid(unsigned char), vtkimagedata->GetNumberOfScalarComponents());
     Initialize(mitk::MakeScalarPixelType<unsigned char>(), m_Dimension, tmpDimensions, channels);
     break;
   case VTK_SHORT: 
     //pixelType.Initialize(typeid(short), vtkimagedata->GetNumberOfScalarComponents());
     Initialize(mitk::MakeScalarPixelType<short>(), m_Dimension, tmpDimensions, channels);
     break;
   case VTK_UNSIGNED_SHORT: 
     //pixelType.Initialize(typeid(unsigned short), vtkimagedata->GetNumberOfScalarComponents());
     Initialize(mitk::MakeScalarPixelType<unsigned short>(), m_Dimension, tmpDimensions, channels);
     break;
   case VTK_INT: 
     //pixelType.Initialize(typeid(int), vtkimagedata->GetNumberOfScalarComponents());
     Initialize(mitk::MakeScalarPixelType<int>(), m_Dimension, tmpDimensions, channels);
     break;
   case VTK_UNSIGNED_INT: 
     //pixelType.Initialize(typeid(unsigned int), vtkimagedata->GetNumberOfScalarComponents());
     Initialize(mitk::MakeScalarPixelType<unsigned int>(), m_Dimension, tmpDimensions, channels);
     break;
   case VTK_LONG: 
     //pixelType.Initialize(typeid(long), vtkimagedata->GetNumberOfScalarComponents());
     Initialize(mitk::MakeScalarPixelType<long>(), m_Dimension, tmpDimensions, channels);
     break;
   case VTK_UNSIGNED_LONG: 
     //pixelType.Initialize(typeid(unsigned long), vtkimagedata->GetNumberOfScalarComponents());
     Initialize(mitk::MakeScalarPixelType<unsigned long>(), m_Dimension, tmpDimensions, channels);
     break;
   case VTK_FLOAT:
     //pixelType.Initialize(typeid(float), vtkimagedata->GetNumberOfScalarComponents());
     Initialize(mitk::MakeScalarPixelType<float>(), m_Dimension, tmpDimensions, channels);
     break;
   case VTK_DOUBLE: 
     //pixelType.Initialize(typeid(double), vtkimagedata->GetNumberOfScalarComponents());
     Initialize(mitk::MakeScalarPixelType<double>(), m_Dimension, tmpDimensions, channels);
     break;
   default:
     break;
   }
   /*
   Initialize(pixelType, 
     m_Dimension, 
     tmpDimensions,
     channels);
 */
 
   const double *spacinglist = vtkimagedata->GetSpacing();
   Vector3D spacing;
   FillVector3D(spacing, spacinglist[0], 1.0, 1.0);
   if(m_Dimension>=2)
     spacing[1]=spacinglist[1];
   if(m_Dimension>=3)
     spacing[2]=spacinglist[2];
 
   // access origin of vtkImage
     Point3D origin;
   vtkFloatingPointType vtkorigin[3];
   vtkimagedata->GetOrigin(vtkorigin);
   FillVector3D(origin, vtkorigin[0], 0.0, 0.0);
   if(m_Dimension>=2)
     origin[1]=vtkorigin[1];
   if(m_Dimension>=3)
     origin[2]=vtkorigin[2];
 
   SlicedGeometry3D* slicedGeometry = GetSlicedGeometry(0);
 
   // re-initialize PlaneGeometry with origin and direction
   PlaneGeometry* planeGeometry = static_cast<PlaneGeometry*>(slicedGeometry->GetGeometry2D(0));
   planeGeometry->SetOrigin(origin);
 
   // re-initialize SlicedGeometry3D
   slicedGeometry->SetOrigin(origin);
   slicedGeometry->SetSpacing(spacing);
   GetTimeSlicedGeometry()->InitializeEvenlyTimed(slicedGeometry, m_Dimensions[3]);
 
   delete [] tmpDimensions;
 }
 
 bool mitk::Image::IsValidSlice(int s, int t, int n) const
 {
   if(m_Initialized)
     return ((s>=0) && (s<(int)m_Dimensions[2]) && (t>=0) && (t< (int) m_Dimensions[3]) && (n>=0) && (n< (int)GetNumberOfChannels()));
   else
     return false;
 }
 
 bool mitk::Image::IsValidVolume(int t, int n) const
 {
   if(m_Initialized)
     return IsValidSlice(0, t, n);
   else
     return false;
 }
 
 bool mitk::Image::IsValidChannel(int n) const
 {
   if(m_Initialized)
     return IsValidSlice(0, 0, n);
   else
     return false;
 }
 
 void mitk::Image::ComputeOffsetTable()
 {
   if(m_OffsetTable!=NULL)
     delete [] m_OffsetTable;
 
   m_OffsetTable=new size_t[m_Dimension>4 ? m_Dimension+1 : 4+1];
 
   unsigned int i;
   size_t num=1;
   m_OffsetTable[0] = 1;
   for (i=0; i < m_Dimension; ++i)
   {
     num *= m_Dimensions[i];
     m_OffsetTable[i+1] = num;
   }
   for (;i < 4; ++i)
     m_OffsetTable[i+1] = num;
 }
 
 bool mitk::Image::IsValidTimeStep(int t) const
 {
   return ( ( m_Dimension >= 4 && t <= (int)m_Dimensions[3] && t > 0 ) || (t == 0) );
 }
 
 void mitk::Image::Expand(unsigned int timeSteps)
 {
   if(timeSteps < 1) itkExceptionMacro(<< "Invalid timestep in Image!");
   Superclass::Expand(timeSteps);
 }
 
 int mitk::Image::GetSliceIndex(int s, int t, int n) const
 {
   if(IsValidSlice(s,t,n)==false) return false;
   return ((size_t)s)+((size_t) t)*m_Dimensions[2]+((size_t) n)*m_Dimensions[3]*m_Dimensions[2]; //??
 }
 
 int mitk::Image::GetVolumeIndex(int t, int n) const
 {
   if(IsValidVolume(t,n)==false) return false;
   return ((size_t)t)+((size_t) n)*m_Dimensions[3]; //??
 }
 
 mitk::Image::ImageDataItemPointer mitk::Image::AllocateSliceData(int s, int t, int n, void *data, ImportMemoryManagementType importMemoryManagement)
 {
   int pos;
   pos=GetSliceIndex(s,t,n);
 
   const size_t ptypeSize = this->m_ImageDescriptor->GetChannelTypeById(n).GetSize();
 
   // is slice available as part of a volume that is available?
   ImageDataItemPointer sl, ch, vol;
   vol=m_Volumes[GetVolumeIndex(t,n)];
   if(vol.GetPointer()!=NULL)
   {
     sl=new ImageDataItem(*vol, m_ImageDescriptor, 2, data, importMemoryManagement == ManageMemory, ((size_t) s)*m_OffsetTable[2]*(ptypeSize));
     sl->SetComplete(true);
     return m_Slices[pos]=sl;
   }
 
   // is slice available as part of a channel that is available?
   ch=m_Channels[n];
   if(ch.GetPointer()!=NULL)
   {
     sl=new ImageDataItem(*ch, m_ImageDescriptor, 2, data, importMemoryManagement == ManageMemory, (((size_t) s)*m_OffsetTable[2]+((size_t) t)*m_OffsetTable[3])*(ptypeSize));
     sl->SetComplete(true);
     return m_Slices[pos]=sl;
   }
 
   // allocate new volume (instead of a single slice to keep data together!)
   m_Volumes[GetVolumeIndex(t,n)]=vol=AllocateVolumeData(t,n,NULL,importMemoryManagement);
   sl=new ImageDataItem(*vol, m_ImageDescriptor, 2, data, importMemoryManagement == ManageMemory, ((size_t) s)*m_OffsetTable[2]*(ptypeSize));
   sl->SetComplete(true);
   return m_Slices[pos]=sl;
 
   ////ALTERNATIVE:
   //// allocate new slice
   //sl=new ImageDataItem(*m_PixelType, 2, m_Dimensions);
   //m_Slices[pos]=sl;
   //return vol;
 }
 
 mitk::Image::ImageDataItemPointer mitk::Image::AllocateVolumeData(int t, int n, void *data, ImportMemoryManagementType importMemoryManagement)
 {
   int pos;
   pos=GetVolumeIndex(t,n);
 
   const size_t ptypeSize = this->m_ImageDescriptor->GetChannelTypeById(n).GetSize();
 
   // is volume available as part of a channel that is available?
   ImageDataItemPointer ch, vol;
   ch=m_Channels[n];
   if(ch.GetPointer()!=NULL)
   {
     vol=new ImageDataItem(*ch, m_ImageDescriptor, 3, data,importMemoryManagement == ManageMemory, (((size_t) t)*m_OffsetTable[3])*(ptypeSize));
     return m_Volumes[pos]=vol;
   }
 
   mitk::PixelType chPixelType = this->m_ImageDescriptor->GetChannelTypeById(n);
 
   // allocate new volume
   if(importMemoryManagement == CopyMemory)
   {
     vol=new ImageDataItem( chPixelType, 3, m_Dimensions, NULL, true);
     if(data != NULL)
       std::memcpy(vol->GetData(), data, m_OffsetTable[3]*(ptypeSize));
   }
   else
   {
     vol=new ImageDataItem( chPixelType, 3, m_Dimensions, data, importMemoryManagement == ManageMemory);
   }
   m_Volumes[pos]=vol;
   return vol;
 }
 
 mitk::Image::ImageDataItemPointer mitk::Image::AllocateChannelData(int n, void *data, ImportMemoryManagementType importMemoryManagement)
 {
   ImageDataItemPointer ch;
   // allocate new channel
   if(importMemoryManagement == CopyMemory)
   {
     const size_t ptypeSize = this->m_ImageDescriptor->GetChannelTypeById(n).GetSize();
 
     ch=new ImageDataItem(this->m_ImageDescriptor, NULL, true);
     if(data != NULL)
       std::memcpy(ch->GetData(), data, m_OffsetTable[4]*(ptypeSize));
   }
   else
   {
     ch=new ImageDataItem(this->m_ImageDescriptor, data, importMemoryManagement == ManageMemory);
   }
   m_Channels[n]=ch;
   return ch;
 }
 
 unsigned int* mitk::Image::GetDimensions() const
 {
   return m_Dimensions;
 }
 
 void mitk::Image::Clear()
 {
   Superclass::Clear();
   delete [] m_Dimensions;
   m_Dimensions = NULL;
 }
 
 void mitk::Image::SetGeometry(Geometry3D* aGeometry3D)
 {
   // Please be aware of the 0.5 offset/pixel-center issue! See Geometry documentation for further information
   
   if(aGeometry3D->GetImageGeometry()==false)
   {
     MITK_INFO << "WARNING: Applied a non-image geometry onto an image. Please be SURE that this geometry is pixel-center-based! If it is not, you need to call Geometry3D->ChangeImageGeometryConsideringOriginOffset(true) before calling image->setGeometry(..)\n";
   }  
   Superclass::SetGeometry(aGeometry3D);
   GetTimeSlicedGeometry()->ImageGeometryOn();
 }
 
 void mitk::Image::PrintSelf(std::ostream& os, itk::Indent indent) const
 {
   unsigned char i;
   if(m_Initialized)
   {
     os << indent << " Dimension: " << m_Dimension << std::endl;
     os << indent << " Dimensions: ";
     for(i=0; i < m_Dimension; ++i)
       os << GetDimension(i) << " ";
     os << std::endl;
 
     for(unsigned int ch=0; ch < this->m_ImageDescriptor->GetNumberOfChannels(); ch++)
     {
       mitk::PixelType chPixelType = this->m_ImageDescriptor->GetChannelTypeById(ch);
 
       os << indent << " Channel: " << this->m_ImageDescriptor->GetChannelName(ch) << std::endl;
       os << indent << " PixelType: " << chPixelType.GetTypeId().name() << std::endl;
       os << indent << " BitsPerElement: " << chPixelType.GetSize() << std::endl;
       os << indent << " NumberOfComponents: " << chPixelType.GetNumberOfComponents() << std::endl;
       os << indent << " BitsPerComponent: " << chPixelType.GetBitsPerComponent() << std::endl;
     }
 
   }
   else
   {
     os << indent << " Image not initialized: m_Initialized: false" << std::endl;
   }
 
   Superclass::PrintSelf(os,indent);
 }
 
 bool mitk::Image::IsRotated() const
 {
   const mitk::Geometry3D* geo = this->GetGeometry();
   bool ret = false;
 
   if(geo)
   {
     const vnl_matrix_fixed<float, 3, 3> & mx = geo->GetIndexToWorldTransform()->GetMatrix().GetVnlMatrix();
     float ref = 0;
     for(short k = 0; k < 3; ++k)
       ref += mx[k][k];
     ref/=1000;  // Arbitrary value; if a non-diagonal (nd) element is bigger then this, matrix is considered nd.
 
     for(short i = 0; i < 3; ++i)
     {
       for(short j = 0; j < 3; ++j)
       {
         if(i != j)
         {
-          if(abs(mx[i][j]) > ref) // matrix is nd
+          if(std::abs(mx[i][j]) > ref) // matrix is nd
             ret = true;
         }
       }
     }
   }
   return ret;
 }
 
 #include "mitkImageStatisticsHolder.h"
 
 //##Documentation
 mitk::ScalarType mitk::Image::GetScalarValueMin(int t) const
 {
   return m_ImageStatistics->GetScalarValueMin(t);
 }
 
 //##Documentation
 //## \brief Get the maximum for scalar images
 mitk::ScalarType mitk::Image::GetScalarValueMax(int t) const
 {
   return m_ImageStatistics->GetScalarValueMax(t);
 }
 
 //##Documentation
 //## \brief Get the second smallest value for scalar images
 mitk::ScalarType mitk::Image::GetScalarValue2ndMin(int t) const
 {
   return m_ImageStatistics->GetScalarValue2ndMin(t);
 }
 
 mitk::ScalarType mitk::Image::GetScalarValueMinNoRecompute( unsigned int t ) const
 {
   return m_ImageStatistics->GetScalarValueMinNoRecompute(t);
 }
 
 mitk::ScalarType mitk::Image::GetScalarValue2ndMinNoRecompute( unsigned int t ) const
 {
   return m_ImageStatistics->GetScalarValue2ndMinNoRecompute(t);
 }
 
 mitk::ScalarType mitk::Image::GetScalarValue2ndMax(int t) const
 {
   return m_ImageStatistics->GetScalarValue2ndMax(t);
 }
 
 mitk::ScalarType mitk::Image::GetScalarValueMaxNoRecompute( unsigned int t) const
 {
   return m_ImageStatistics->GetScalarValueMaxNoRecompute(t);
 }
 
 mitk::ScalarType mitk::Image::GetScalarValue2ndMaxNoRecompute( unsigned int t ) const
 {
   return m_ImageStatistics->GetScalarValue2ndMaxNoRecompute(t);
 }
 
 mitk::ScalarType mitk::Image::GetCountOfMinValuedVoxels(int t ) const
 {
   return m_ImageStatistics->GetCountOfMinValuedVoxels(t);
 }
 
 mitk::ScalarType mitk::Image::GetCountOfMaxValuedVoxels(int t) const
 {
   return m_ImageStatistics->GetCountOfMaxValuedVoxels(t);
 }
 
 unsigned int mitk::Image::GetCountOfMaxValuedVoxelsNoRecompute( unsigned int t  ) const
 {
   return m_ImageStatistics->GetCountOfMaxValuedVoxelsNoRecompute(t);
 }
 
 unsigned int mitk::Image::GetCountOfMinValuedVoxelsNoRecompute( unsigned int t ) const
 {
   return m_ImageStatistics->GetCountOfMinValuedVoxelsNoRecompute(t);
 }
 
diff --git a/Core/Code/IO/mitkPixelType.h b/Core/Code/IO/mitkPixelType.h
index 14dffbd58d..8d4c2aae3c 100644
--- a/Core/Code/IO/mitkPixelType.h
+++ b/Core/Code/IO/mitkPixelType.h
@@ -1,259 +1,258 @@
 /*===================================================================
 
 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 PIXELTYPE_H_HEADER_INCLUDED_C1EBF565
 #define PIXELTYPE_H_HEADER_INCLUDED_C1EBF565
 
 #include <MitkExports.h>
 #include "mitkCommon.h"
 #include "mitkPixelTypeTraits.h"
 
 #include <typeinfo>
 #include <string>
 
 #include <itkImageIOBase.h>
 #include <itkImage.h>
 
 namespace mitk {
 
 template< typename ComponentT>
 const char* ComponentTypeToString()
 {
   return typeid(ComponentT).name();
 }
 
 template<typename PixelT>
 const char* PixelTypeToString()
 {
   return typeid(PixelT).name();
 }
 
 
 //##Documentation
 //## @brief Class for defining the data type of pixels 
 //##
 //## To obtain additional type information not provided by this class
 //## itk::ImageIOBase can be used by passing the return value of 
 //## PixelType::GetItkTypeId() to itk::ImageIOBase::SetPixelTypeInfo
 //## and using the itk::ImageIOBase methods GetComponentType,
 //## GetComponentTypeAsString, GetPixelType, GetPixelTypeAsString.
 //## @ingroup Data
 class MITK_CORE_EXPORT PixelType
 {
 public:
-  itkTypeMacro(PixelType, None);
 
   typedef itk::ImageIOBase::IOPixelType ItkIOPixelType;
 
   PixelType(const mitk::PixelType & aPixelType);
 
   /** \brief Get the \a type_info of the scalar (!) type. Each element
   * may contain m_NumberOfComponents (more than one) of these scalars.
   *
   */
   inline const std::type_info& GetTypeId() const
   {
     return m_ComponentType;
   }
 
   /** \brief Get the \a type_info of the whole pixel type.
   *
   * If you want the type information for the component of a compound type use the
   * GetTypeId() method
   */
   inline const std::type_info& GetPixelTypeId() const
   {
     return m_PixelType;
   }
 
   /** \brief Returns a string containing the ItkTypeName,
     *
     * The string provides the same information as GetPixelTypeId.name()
     */
   std::string GetItkTypeAsString() const
   {
     return m_PixelTypeName;
   }
 
   /** \brief Returns a string containing the type name of the component,
     *
     * The string provides the same information as GetTypeId.name()
     */
   std::string GetComponentTypeAsString() const
   {
       return m_ComponentTypeName;
   }
 
   /** \brief Get size of the PixelType in bytes
     *
     * A RGBA PixelType of floats will return 4 * sizeof(float)
   */
   size_t GetSize() const
   {
     return (m_NumberOfComponents * m_BytesPerComponent);
   }
 
   /** \brief Get the number of bits per element (of an
   * element)
   *
   * A vector of double with three components will return
   * 8*sizeof(double)*3.
   * \sa GetBitsPerComponent
   * \sa GetItkTypeId
   * \sa GetTypeId
   */
   size_t GetBpe() const
   {
     return this->GetSize() * 8;
   }
 
   /** \brief Get the number of components of which each element consists
   *
   * Each pixel can consist of multiple components, e.g. RGB.
   */
   inline size_t GetNumberOfComponents() const
   {
     return m_NumberOfComponents;    
   }
   
   /** \brief Get the number of bits per components
   * \sa GetBitsPerComponent
   */
   inline size_t GetBitsPerComponent() const
   {
     return m_BytesPerComponent * 8;
   }
   
   bool operator==(const PixelType& rhs) const;
   bool operator!=(const PixelType& rhs) const;
 
   bool operator==(const std::type_info& typeId) const;
   bool operator!=(const std::type_info& typeId) const;
 
   ~PixelType() {}
 
 private:
 
   friend class ItkImageFileReader;
 
   friend class NrrdTbssImageReader;
   friend class NrrdTbssRoiImageReader;
 
   template< typename ComponentT, typename PixelT, std::size_t numberOfComponents >
     friend PixelType MakePixelType();
 
   template< typename ItkImageType >
     friend PixelType MakePixelType();
 
   PixelType( const std::type_info& componentType,
              const std::type_info& pixelType,
              std::size_t bytesPerComponent,
              std::size_t numberOfComponents,
              const char* componentTypeName = 0,
              const char* pixelTypeName = 0 )
     : m_ComponentType( componentType ),
       m_PixelType( pixelType ),
       m_NumberOfComponents( numberOfComponents ),
       m_BytesPerComponent( bytesPerComponent )
   {
     if(componentTypeName) m_ComponentTypeName = componentTypeName;
     else m_ComponentTypeName = componentType.name();
 
     if(pixelTypeName) m_PixelTypeName = pixelTypeName;
     else m_PixelTypeName = pixelType.name();
   }
 
   // default constructor is disabled on purpose
   PixelType(void);
 
   // assignment operator declared private on purpose
   PixelType& operator=(const PixelType& other);
 
   /** \brief the \a type_info of the scalar (!) component type. Each element
     may contain m_NumberOfComponents (more than one) of these scalars.
   */
   const std::type_info& m_ComponentType;
 
   const std::type_info& m_PixelType;
 
   std::string m_ComponentTypeName;
 
   std::string m_PixelTypeName;
   
   std::size_t m_NumberOfComponents;
 
   std::size_t m_BytesPerComponent;
 
 };
 
 /** \brief A template method for creating a pixel type.
   */
 template< typename ComponentT, typename PixelT, std::size_t numOfComponents >
 PixelType MakePixelType()
 {
   typedef itk::Image< PixelT, numOfComponents> ItkImageType;
 
   return PixelType( typeid(ComponentT), typeid(ItkImageType),
                     sizeof(ComponentT), numOfComponents,
                     ComponentTypeToString<ComponentT>(),
                     PixelTypeToString<ItkImageType>()
                    );
 }
 
 /** \brief A template method for creating a pixel type from an ItkImageType
   *
   * For fixed size vector images ( i.e. images of type itk::FixedArray<3,float> ) also the number of components
   * is propagated to the constructor
   */
 template< typename ItkImageType >
 PixelType MakePixelType()
 {
   // define new type, since the ::PixelType is used to distinguish between simple and compound types
   typedef typename ItkImageType::PixelType ImportPixelType;
 
   // get the component type ( is either directly ImportPixelType or ImportPixelType::ValueType for compound types )
   typedef typename GetComponentType<ImportPixelType>::ComponentType ComponentT;
 
   // The PixelType is the same as the ComponentT for simple types
   typedef typename ItkImageType::PixelType PixelT;
 
   // Get the length of compound type ( initialized to 1 for simple types and variable-length vector images)
   size_t numComp = ComponentsTrait<
     (isPrimitiveType<PixelT>::value || isVectorImage<PixelT, ComponentT>::value), ItkImageType >::Size;
 
   // call the constructor
   return PixelType(
             typeid(ComponentT), typeid(PixelT),
             sizeof(ComponentT), numComp,
             ComponentTypeToString<ComponentT>(),
             PixelTypeToString<PixelT >()
          );
 }
 
 /** \brief An interface to the MakePixelType method for creating scalar pixel types.
   *
   * Usage: for example MakeScalarPixelType<short>() for a scalar short image
   */
 template< typename T>
 PixelType MakeScalarPixelType()
 {
     return MakePixelType<T,T,1>();
 }
 
 } // namespace mitk
 
 #endif /* PIXELTYPE_H_HEADER_INCLUDED_C1EBF565 */
diff --git a/Core/Code/Interactions/StateMachine.xml b/Core/Code/Interactions/StateMachine.xml
index f4585e53f7..ee9103b3d5 100644
--- a/Core/Code/Interactions/StateMachine.xml
+++ b/Core/Code/Interactions/StateMachine.xml
@@ -1,3913 +1,3954 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Event_Id = 0: this is a * transition with all other eventId's not declared in that state -->
 <mitkInteraktionStates xmlns="http://tempuri.org/StateMachine.xsd" STYLE="User001">
   <!-- ***WARNING*** do not use any &, % and so on in NAME -->
   <!-- -->
   <!-- -->
   <!-- EventDescriptions -->
   <events STYLE="standard">
     <!-- Null Event -->
-    <!-- not here defined, cause this will never be send from external to mitk (to be mapped in mitkEventMapper to an mitk-event)-->
+    <!-- not here defined, cause this will never be send from external to mitk (to be mapped in mitkEventMapper to an mitk-event) -->
+    <!-- -->
+    <!-- The names of all events that contain mouseinteractions should follow the following guidelines: -->
+    <!--  -->
+    <!-- <button-id> mbtn + <action> + <modifier> -->
+    <!--   -->
+    <!-- <button-id> MUST BE either left, middle or right -->
+    <!-- <action> CAN be either empty (button pressed), 'DC' (double-click), 'MouseMove' (pressed + moved) or 'release' (button released). -->
+    <!-- <modifier> MAY be either 'shift', 'ctrl', 'alt' or a combination of these  -->
+    <!-- three modifiers. MAKE SURE THE CORRECT ORDER IS MAINTAINED! Do not use 'strg' instead of 'ctrl'. -->
+    <!--  -->
+    <!-- Following the guidelines make it easier to maintain the list and add new events if necessary. -->
+    <!--  -->
     <!-- left MouseButton -->
-    <event NAME="left MouseBN" ID="1" TYPE="Type_MouseButtonPress" BUTTON="BS_LeftButton" BUTTONSTATE="0x0000" KEY="Key_none" />
+    <event NAME="left mbtn" ID="1" TYPE="Type_MouseButtonPress" BUTTON="BS_LeftButton" BUTTONSTATE="0x0000" KEY="Key_none" />
     <!-- right MouseButton -->
-    <event NAME="right MouseBN" ID="2" TYPE="Type_MouseButtonPress" BUTTON="BS_RightButton" BUTTONSTATE="0x0000" KEY="Key_none" />
-    <!-- Shift + left MouseButton -->
-    <event NAME="left MouseBN + Shift" ID="3" TYPE="Type_MouseButtonPress" BUTTON="BS_LeftButton" BUTTONSTATE="0x0100" KEY="Key_none" />
+    <event NAME="right mbtn" ID="2" TYPE="Type_MouseButtonPress" BUTTON="BS_RightButton" BUTTONSTATE="0x0000" KEY="Key_none" />
+    <!-- shift + left MouseButton -->
+    <event NAME="left mbtn + shift" ID="3" TYPE="Type_MouseButtonPress" BUTTON="BS_LeftButton" BUTTONSTATE="0x0100" KEY="Key_none" />
     <!-- middle MouseButton -->
-    <event NAME="middle MouseBN" ID="4" TYPE="Type_MouseButtonPress" BUTTON="BS_MidButton" BUTTONSTATE="0x0000" KEY="Key_none" />
+    <event NAME="middle mbtn" ID="4" TYPE="Type_MouseButtonPress" BUTTON="BS_MidButton" BUTTONSTATE="0x0000" KEY="Key_none" />
     <!-- Ctrl + left MouseButton -->
-    <event NAME="CTRL+leftBN" ID="5" TYPE="Type_MouseButtonPress" BUTTON="BS_LeftButton" BUTTONSTATE="0x0200" KEY="Key_none" />
+    <event NAME="left mbtn + ctrl" ID="5" TYPE="Type_MouseButtonPress" BUTTON="BS_LeftButton" BUTTONSTATE="0x0200" KEY="Key_none" />
     <!-- Ctrl + middle MouseButton -->
-    <event NAME="CTRL+middleBN" ID="6" TYPE="Type_MouseButtonPress" BUTTON="BS_MidButton" BUTTONSTATE="0x0200" KEY="Key_none" />
+    <event NAME="middle mbtn + ctrl" ID="6" TYPE="Type_MouseButtonPress" BUTTON="BS_MidButton" BUTTONSTATE="0x0200" KEY="Key_none" />
     <!-- Ctrl + right MouseButton -->
-    <event NAME="CTRL+rightBN" ID="7" TYPE="Type_MouseButtonPress" BUTTON="BS_RightButton" BUTTONSTATE="0x0200" KEY="Key_none" />
+    <event NAME="right mbtn + ctrl" ID="7" TYPE="Type_MouseButtonPress" BUTTON="BS_RightButton" BUTTONSTATE="0x0200" KEY="Key_none" />
     <!-- left MouseButton DoubleClick-->
-    <event NAME="left MouseBN DC" ID="8" TYPE="Type_MouseButtonDblClick" BUTTON="BS_LeftButton" BUTTONSTATE="0x0000" KEY="Key_none" />
+    <event NAME="left mbtn DC" ID="8" TYPE="Type_MouseButtonDblClick" BUTTON="BS_LeftButton" BUTTONSTATE="0x0000" KEY="Key_none" />
     <!-- MouseWheel-->
     <event NAME="MouseWheel" ID="9" TYPE="Type_Wheel" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />
-    <!-- Strg + N -->
-    <event NAME="Strg + N" ID="10" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0200" KEY="Key_N" />
-    <!-- Strg + E -->
-    <event NAME="Strg + E" ID="11" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0200" KEY="Key_E" />
+    <!-- ctrl + N -->
+    <event NAME="N + ctrl" ID="10" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0200" KEY="Key_N" />
+    <!-- ctrl + E -->
+    <event NAME="E + ctrl" ID="11" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0200" KEY="Key_E" />
     <!-- Delete -->
     <event NAME="Delete" ID="12" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_Delete" />
     <!-- Esc -->
     <event NAME="Escape" ID="14" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_Escape" />
     <!-- N-->
     <event NAME="N" ID="13" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_N" />
     <!-- P-->
     <event NAME="P" ID="15" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_P" />
     <!-- R-->
     <event NAME="R" ID="16" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_R" />
     <!-- T-->
     <event NAME="T" ID="17" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_T" />
     <!-- S-->
     <event NAME="S" ID="18" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_S" />
     <!-- E -->
     <event NAME="E" ID="19" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_E" />
-    <!-- Strg + Alt + A -->
-    <event NAME="Strg+Alt+A" ID="20" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0600" KEY="Key_A" />
-    <!-- Strg + Alt + B -->
-    <event NAME="Strg+Alt+B" ID="21" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0600" KEY="Key_B" />
+    <!-- ctrl + alt + A -->
+    <event NAME="A + ctrl + alt" ID="20" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0600" KEY="Key_A" />
+    <!-- ctrl + alt + B -->
+    <event NAME="B + ctrl + alt" ID="21" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0600" KEY="Key_B" />
     <!-- H-->
     <event NAME="H" ID="22" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_H" />
     <!-- Return -->
     <event NAME="Return" ID="23" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_Return" />
     <!-- Enter -->
     <event NAME="Enter" ID="24" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_Enter" />
     <!-- Space -->
     <event NAME="Space" ID="25" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_Space" />
     <!-- Plus -->
     <event NAME="Plus" ID="26" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_Plus" />
     <!-- Minus -->
     <event NAME="Minus" ID="27" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_Minus" />
-    <!-- Strg + Alt + H -->
-    <event NAME="Strg+Alt+H" ID="30" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0600" KEY="Key_H" />
-    <!-- Strg + Alt + I -->
-    <event NAME="Strg+Alt+I" ID="31" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0600" KEY="Key_I" />
-    <!-- Strg + Alt + S -->
-    <event NAME="Strg+Alt+S" ID="40" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0600" KEY="Key_S" />
+    <!-- ctrl + alt + H -->
+    <event NAME="H + ctrl + alt" ID="30" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0600" KEY="Key_H" />
+    <!-- ctrl + alt + I -->
+    <event NAME="I + ctrl + alt" ID="31" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0600" KEY="Key_I" />
+    <!-- ctrl + alt + S -->
+    <event NAME="S + ctrl + alt" ID="40" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0600" KEY="Key_S" />
     <!-- ArrowUp -->
     <event NAME="ArrowUp" ID="50" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_Up" />
     <!-- ArrowDown -->
     <event NAME="ArrowDown" ID="51" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_Down" />
     <!-- ArrowLeft -->
     <event NAME="ArrowLeft" ID="52" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_Left" />
     <!-- ArrowRight -->
     <event NAME="ArrowRight" ID="53" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_Right" />
-    <!-- ArrowUp + Shift -->
-    <event NAME="ArrowUp+Shift" ID="54" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0100" KEY="Key_Up" />
-    <!-- ArrowDown +Shift -->
-    <event NAME="ArrowDown+Shift" ID="55" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0100" KEY="Key_Down" />
-    <!-- Alt -->
-    <event NAME="Alt" ID="90" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0400" KEY="Key_Alt" />
-    <!-- Strg + B -->
-    <event NAME="Strg+B" ID="91" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0200" KEY="Key_B" />
+    <!-- ArrowUp + shift -->
+    <event NAME="ArrowUp + shift" ID="54" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0100" KEY="Key_Up" />
+    <!-- ArrowDown +shift -->
+    <event NAME="ArrowDown + shift" ID="55" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0100" KEY="Key_Down" />
+    <!-- alt -->
+    <event NAME="alt" ID="90" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0400" KEY="Key_alt" />
+    <!-- ctrl + B -->
+    <event NAME="B + ctrl" ID="91" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0200" KEY="Key_B" />
     <!-- leftMouseButtonRelease -->
-    <event NAME="leftMouseRelease" ID="505" TYPE="Type_MouseButtonRelease" BUTTON="BS_LeftButton" BUTTONSTATE="0x0001" KEY="Key_none" />
+    <event NAME="left mbtn release" ID="505" TYPE="Type_MouseButtonRelease" BUTTON="BS_LeftButton" BUTTONSTATE="0x0001" KEY="Key_none" />
     <!-- MiddleMouseButtonRelease -->
-    <event NAME="MiddleMouseRelease" ID="506" TYPE="Type_MouseButtonRelease" BUTTON="BS_MidButton" BUTTONSTATE="0x0004" KEY="Key_none" />
+    <event NAME="middle mbtn release" ID="506" TYPE="Type_MouseButtonRelease" BUTTON="BS_MidButton" BUTTONSTATE="0x0004" KEY="Key_none" />
     <!-- RightMouseButtonRelease -->
-    <event NAME="RightMouseRelease" ID="507" TYPE="Type_MouseButtonRelease" BUTTON="BS_RightButton" BUTTONSTATE="0x0002" KEY="Key_none" />
-    <!-- Shift + left MouseButtonRelease -->
-    <event NAME="left MouseBNRelease+Shift" ID="508" TYPE="Type_MouseButtonRelease" BUTTON="BS_LeftButton" BUTTONSTATE="0x0101" KEY="Key_none" />
+    <event NAME="right mbtn release" ID="507" TYPE="Type_MouseButtonRelease" BUTTON="BS_RightButton" BUTTONSTATE="0x0002" KEY="Key_none" />
+    <!-- shift + left MouseButtonRelease -->
+    <event NAME="left mbtn release + shift" ID="508" TYPE="Type_MouseButtonRelease" BUTTON="BS_LeftButton" BUTTONSTATE="0x0101" KEY="Key_none" />
     <!-- MouseMove -->
     <event NAME="MouseMove" ID="520" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />
     <!-- left MouseButton and MouseWheel -->
-    <event NAME="leftBN+MouseWheel" ID="521" TYPE="Type_Wheel" BUTTON="BS_LeftButton" BUTTONSTATE="0x0001" KEY="Key_none" />
+    <event NAME="left mbtn + MouseWheel" ID="521" TYPE="Type_Wheel" BUTTON="BS_LeftButton" BUTTONSTATE="0x0001" KEY="Key_none" />
     <!-- right MouseButton and MouseWheel -->
-    <event NAME="rightBN+MouseWheel" ID="522" TYPE="Type_Wheel" BUTTON="BS_RightButton" BUTTONSTATE="0x0002" KEY="Key_none" />
+    <event NAME="right mbtn + MouseWheel" ID="522" TYPE="Type_Wheel" BUTTON="BS_RightButton" BUTTONSTATE="0x0002" KEY="Key_none" />
     <!-- middle MouseButton and MouseWheel -->
-    <event NAME="middleBN+MouseWheel" ID="523" TYPE="Type_Wheel" BUTTON="BS_MidButton" BUTTONSTATE="0x0004" KEY="Key_none" />
+    <event NAME="middle mbtn + MouseWheel" ID="523" TYPE="Type_Wheel" BUTTON="BS_MidButton" BUTTONSTATE="0x0004" KEY="Key_none" />
     <!-- left MouseButton and MouseMove -->
-    <event NAME="leftBN+MouseMove" ID="530" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0001" KEY="Key_none" />
+    <event NAME="left mbtn + MouseMove" ID="530" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0001" KEY="Key_none" />
     <!-- right MouseButton and MouseMove -->
-    <event NAME="rightBN+MouseMove" ID="531" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0002" KEY="Key_none" />
+    <event NAME="right mbtn + MouseMove" ID="531" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0002" KEY="Key_none" />
     <!-- middle MouseButton and MouseMove -->
-    <event NAME="middleBN+MouseMove" ID="533" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0004" KEY="Key_none" />
-    <!-- CTRL + left MouseButton and MouseMove -->
-    <event NAME="CTRL+leftBN+MouseMove" ID="534" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0201" KEY="Key_none" />
-    <!-- CTRL + right MouseButton and MouseMove -->
-    <event NAME="CTRL+rightBN+MouseMove" ID="535" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0202" KEY="Key_none" />
-    <!-- CTRL + middle MouseButton and MouseMove -->
-    <event NAME="CTRL+middleBN+MouseMove" ID="536" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0204" KEY="Key_none" />
-    <!-- CTRL + left MouseButtonRelease -->
-    <event NAME="CTRL+leftBNRelease" ID="537" TYPE="Type_MouseButtonRelease" BUTTON="BS_LeftButton" BUTTONSTATE="0x0201" KEY="Key_none" />
-    <!-- CTRL + right MouseButtonRelease -->
-    <event NAME="CTRL+rightBNRelease" ID="538" TYPE="Type_MouseButtonRelease" BUTTON="BS_RightButton" BUTTONSTATE="0x0202" KEY="Key_none" />
-    <!-- CTRL + middle MouseButtonRelease -->
-    <event NAME="CTRL+middleBNRelease" ID="539" TYPE="Type_MouseButtonRelease" BUTTON="BS_MidButton" BUTTONSTATE="0x0204" KEY="Key_none" />
-    <!-- Shift + Ctrl + left MouseButton -->
-    <event NAME="SHIFT+CTRL+MousePress" ID="540" TYPE="Type_MouseButtonPress" BUTTON="BS_LeftButton" BUTTONSTATE="0x0300" KEY="Key_none" />
-    <!-- Shift + Ctrl + left MouseButtonMove -->
-    <event NAME="SHIFT+CTRL+MouseMove" ID="542" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0301" KEY="Key_none" />
-    <!-- Shift + Ctrl + left MouseButtonRelease -->
-    <event NAME="SHIFT+CTRL+MouseRelease" ID="543" TYPE="Type_MouseButtonRelease" BUTTON="BS_LeftButton" BUTTONSTATE="0x0301" KEY="Key_none" />
-    <!-- Shift + left MouseButton and MouseMove -->
-    <event NAME="Shift+leftBN+MouseMove" ID="541" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0101" KEY="Key_none" />
-    <!-- ALT + left MouseButton -->
-    <event NAME="ALT+leftBN" ID="600" TYPE="Type_MouseButtonPress" BUTTON="BS_LeftButton" BUTTONSTATE="0x0400" KEY="Key_none" />
-    <!-- ALT + left MouseButton and MouseMove -->
-    <event NAME="ALT+leftBN+MouseMove" ID="610" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0401" KEY="Key_none" />
-    <!-- ALT + leftMouseButtonRelease -->
-    <event NAME="ALT+leftMouseRelease" ID="620" TYPE="Type_MouseButtonRelease" BUTTON="BS_LeftButton" BUTTONSTATE="0x0401" KEY="Key_none" />
-    <!-- CTRL + MouseWheel -->
-    <event NAME="CTRL+MouseWheel" ID="630" TYPE="Type_Wheel" BUTTON="BS_NoButton" BUTTONSTATE="0x0200" KEY="Key_none" />
-    <!-- ALT + MouseWheel -->
-    <event NAME="ALT+MouseWheel" ID="640" TYPE="Type_Wheel" BUTTON="BS_NoButton" BUTTONSTATE="0x0400" KEY="Key_none" />
-    <!-- ALT + middle MouseButton -->
-    <event NAME="ALT+middleBN" ID="641" TYPE="Type_MouseButtonPress" BUTTON="BS_MidButton" BUTTONSTATE="0x0400" KEY="Key_none" />
-    <!-- ALT + middle MouseButton and MouseMove -->
-    <event NAME="ALT+middleBN+MouseMove" ID="642" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0404" KEY="Key_none" />
-    <!-- ALT + middle MouseButtonRelease -->
-    <event NAME="ALT+middleBNRelease" ID="643" TYPE="Type_MouseButtonRelease" BUTTON="BS_MidButton" BUTTONSTATE="0x0404" KEY="Key_none" />
-    <!-- ALT + SHIFT + right MouseButton -->
-    <event NAME="ALT+SHIFT+rightBN" ID="644" TYPE="Type_MouseButtonPress" BUTTON="BS_RightButton" BUTTONSTATE="0x0500" KEY="Key_none" />
-    <!-- ALT + SHIFT + right MouseButton and MouseMove -->
-    <event NAME="ALT+SHIFT+rightBN+MouseMove" ID="645" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0502" KEY="Key_none" />
-    <!-- ALT + SHIFT + right MouseButtonRelease -->
-    <event NAME="ALT+SHIFT+rightBN" ID="646" TYPE="Type_MouseButtonRelease" BUTTON="BS_RightButton" BUTTONSTATE="0x0502" KEY="Key_none" />
-    <!-- SHIFT + rightMouseButtonPress -->
-    <event NAME="Shift+rightMousePress" ID="2000" TYPE="Type_MouseButtonPress" BUTTON="BS_RightButton" BUTTONSTATE="0x0100" KEY="Key_none" />
-    <!-- SHIFT + rightMouseButtonMove -->
-    <event NAME="Shift+rightMouseMove" ID="2001" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0102" KEY="Key_none" />
-    <!-- SHIFT + rightMouseButtonRelease -->
-    <event NAME="Shift+rightMouseRelease" ID="2002" TYPE="Type_MouseButtonRelease" BUTTON="BS_RightButton" BUTTONSTATE="0x0102" KEY="Key_none" />
-    <!-- SHIFT + middleMouseButtonPress -->
-    <event NAME="Shift+middleMousePress" ID="2003" TYPE="Type_MouseButtonPress" BUTTON="BS_MidButton" BUTTONSTATE="0x0100" KEY="Key_none" />
-    <!-- SHIFT + middleMouseButtonMove -->
-    <event NAME="Shift+middleMouseMove" ID="2004" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0104" KEY="Key_none" />
-    <!-- SHIFT + middleMouseButtonRelease -->
-    <event NAME="Shift+middleMouseRelease" ID="2005" TYPE="Type_MouseButtonRelease" BUTTON="BS_MidButton" BUTTONSTATE="0x0104" KEY="Key_none" />
+    <event NAME="middle mbtn + MouseMove" ID="533" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0004" KEY="Key_none" />
+    <!-- ctrl + left MouseButton and MouseMove -->
+    <event NAME="left mbtn + MouseMove + ctrl" ID="534" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0201" KEY="Key_none" />
+    <!-- ctrl + right MouseButton and MouseMove -->
+    <event NAME="right mbtn + MouseMove + ctrl" ID="535" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0202" KEY="Key_none" />
+    <!-- ctrl + middle MouseButton and MouseMove -->
+    <event NAME="middle mbtn + MouseMove + ctrl" ID="536" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0204" KEY="Key_none" />
+    <!-- ctrl + left MouseButtonRelease -->
+    <event NAME="left mbtn release + ctrl" ID="537" TYPE="Type_MouseButtonRelease" BUTTON="BS_LeftButton" BUTTONSTATE="0x0201" KEY="Key_none" />
+    <!-- ctrl + right MouseButtonRelease -->
+    <event NAME="right mbtn release + ctrl" ID="538" TYPE="Type_MouseButtonRelease" BUTTON="BS_RightButton" BUTTONSTATE="0x0202" KEY="Key_none" />
+    <!-- ctrl + middle MouseButtonRelease -->
+    <event NAME="middle mbtn release + ctrl" ID="539" TYPE="Type_MouseButtonRelease" BUTTON="BS_MidButton" BUTTONSTATE="0x0204" KEY="Key_none" />
+    <!-- shift + Ctrl + left MouseButton -->
+    <event NAME="left mbtn + shift + ctrl" ID="540" TYPE="Type_MouseButtonPress" BUTTON="BS_LeftButton" BUTTONSTATE="0x0300" KEY="Key_none" />
+    <!-- shift + Ctrl + left MouseButtonMove -->
+    <event NAME="left mbtn + MouseMove + shift + ctrl" ID="542" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0301" KEY="Key_none" />
+    <!-- shift + Ctrl + left MouseButtonRelease -->
+    <event NAME="left mbtn release + shift + ctrl" ID="543" TYPE="Type_MouseButtonRelease" BUTTON="BS_LeftButton" BUTTONSTATE="0x0301" KEY="Key_none" />
+    <!-- shift + left MouseButton and MouseMove -->
+    <event NAME="left mbtn + MouseMove + shift" ID="541" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0101" KEY="Key_none" />
+    <!-- alt + left MouseButton -->
+    <event NAME="left mbtn + alt" ID="600" TYPE="Type_MouseButtonPress" BUTTON="BS_LeftButton" BUTTONSTATE="0x0400" KEY="Key_none" />
+    <!-- alt + left MouseButton and MouseMove -->
+    <event NAME="left mbtn + MouseMove + alt" ID="610" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0401" KEY="Key_none" />
+    <!-- alt + leftMouseButtonRelease -->
+    <event NAME="left mbtn release + alt" ID="620" TYPE="Type_MouseButtonRelease" BUTTON="BS_LeftButton" BUTTONSTATE="0x0401" KEY="Key_none" />
+    <!-- ctrl + MouseWheel -->
+    <event NAME="MouseWheel + ctrl" ID="630" TYPE="Type_Wheel" BUTTON="BS_NoButton" BUTTONSTATE="0x0200" KEY="Key_none" />
+    <!-- alt + MouseWheel -->
+    <event NAME="MouseWheel + alt" ID="640" TYPE="Type_Wheel" BUTTON="BS_NoButton" BUTTONSTATE="0x0400" KEY="Key_none" />
+    <!-- alt + middle MouseButton -->
+    <event NAME="middle mbtn + alt" ID="641" TYPE="Type_MouseButtonPress" BUTTON="BS_MidButton" BUTTONSTATE="0x0400" KEY="Key_none" />
+    <!-- alt + middle MouseButton and MouseMove -->
+    <event NAME="middle mbtn + MouseMove + alt" ID="642" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0404" KEY="Key_none" />
+    <!-- alt + middle MouseButtonRelease -->
+    <event NAME="middle mbtn release + alt" ID="643" TYPE="Type_MouseButtonRelease" BUTTON="BS_MidButton" BUTTONSTATE="0x0404" KEY="Key_none" />
+    <!-- alt + shift + right MouseButton -->
+    <event NAME="right mbtn + shift + alt" ID="644" TYPE="Type_MouseButtonPress" BUTTON="BS_RightButton" BUTTONSTATE="0x0500" KEY="Key_none" />
+    <!-- alt + shift + right MouseButton and MouseMove -->
+    <event NAME="right mbtn + MouseMove + shift + alt" ID="645" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0502" KEY="Key_none" />
+    <!-- alt + shift + right MouseButtonRelease -->
+    <event NAME="right mbtn release + shift + alt" ID="646" TYPE="Type_MouseButtonRelease" BUTTON="BS_RightButton" BUTTONSTATE="0x0502" KEY="Key_none" />
+    <!-- shift + rightMouseButtonPress -->
+    <event NAME="right mbtn + shift" ID="2000" TYPE="Type_MouseButtonPress" BUTTON="BS_RightButton" BUTTONSTATE="0x0100" KEY="Key_none" />
+    <!-- shift + rightMouseButtonMove -->
+    <event NAME="right mbtn + MouseMove + shift" ID="2001" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0102" KEY="Key_none" />
+    <!-- shift + rightMouseButtonRelease -->
+    <event NAME="right mbtn release + shift" ID="2002" TYPE="Type_MouseButtonRelease" BUTTON="BS_RightButton" BUTTONSTATE="0x0102" KEY="Key_none" />
+    <!-- shift + middleMouseButtonPress -->
+    <event NAME="middle mbtn + shift" ID="2003" TYPE="Type_MouseButtonPress" BUTTON="BS_MidButton" BUTTONSTATE="0x0100" KEY="Key_none" />
+    <!-- shift + middleMouseButtonMove -->
+    <event NAME="middle mbtn + MouseMove + shift" ID="2004" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0104" KEY="Key_none" />
+    <!-- shift + middleMouseButtonRelease -->
+    <event NAME="middle mbtn release + shift" ID="2005" TYPE="Type_MouseButtonRelease" BUTTON="BS_MidButton" BUTTONSTATE="0x0104" KEY="Key_none" />
+        
+    <event NAME="right mbtn + alt" ID="2006" TYPE="Type_MouseButtonPress" BUTTON="BS_RightButton" BUTTONSTATE="0x0400" KEY="Key_none" />
+    <event NAME="right mbtn + Mousemove + alt" ID="2007" TYPE="Type_MouseMove" BUTTON="BS_RightButton" BUTTONSTATE="0x0400" KEY="Key_none" />
+    <event NAME="right mbtn release + alt" ID="2008" TYPE="Type_MouseButtonRelease" BUTTON="BS_RightButton" BUTTONSTATE="0x0400" KEY="Key_none" />
+    
+        <!-- alt + shift + right MouseButton -->
+    <event NAME="right mbtn + shift + ctrl" ID="2010" TYPE="Type_MouseButtonPress" BUTTON="BS_RightButton" BUTTONSTATE="0x0301" KEY="Key_none" />
+    <!-- alt + shift + right MouseButton and MouseMove -->
+    <event NAME="right mbtn + MouseMove + shift + ctrl" ID="2011" TYPE="Type_MouseMove" BUTTON="BS_NoButton" BUTTONSTATE="0x0301" KEY="Key_none" />
+    <!-- alt + shift + right MouseButtonRelease -->
+    <event NAME="right mbtn release + shift + ctrl" ID="2012" TYPE="Type_MouseButtonRelease" BUTTON="BS_RightButton" BUTTONSTATE="0x0301" KEY="Key_none" />
+
+        <!-- alt + MouseWheel -->
+    <event NAME="MouseWheel + shift" ID="2015" TYPE="Type_Wheel" BUTTON="BS_NoButton" BUTTONSTATE="0x0100" KEY="Key_none" />
+
+    
+    
     <!-- -->
     <!-- -->
     <!-- own thrown events -->
     <!-- *****Important*****: has to be set in mitkInteractionConst.h-->
     <event NAME="new" ID="1000" TYPE="Type_User" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />
     <event NAME="old" ID="1001" TYPE="Type_User" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />
     <event NAME="finished" ID="1002" TYPE="Type_User" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />
     <event NAME="StSELECT" ID="1003" TYPE="Type_User" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />
     <event NAME="StDESELECT" ID="1004" TYPE="Type_User" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />
     <event NAME="EIDNO" ID="1003" TYPE="Type_User" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />
     <event NAME="EIDYES" ID="1004" TYPE="Type_User" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />
     <event NAME="same" ID="1005" TYPE="Type_User" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />
     <event NAME="no and last object" ID="1006" TYPE="Type_User" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />
     <event NAME="no and not last object" ID="1007" TYPE="Type_User" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />
     <event NAME="last" ID="1008" TYPE="Type_User" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />
     <event NAME="not last" ID="1009" TYPE="Type_User" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />
     <event NAME="SetStateMachineToSelectedMode" ID="1030" TYPE="Type_User" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />
     <event NAME="SetStateMachineToDeselectedMode" ID="1031" TYPE="Type_User" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />
     <!-- for n-PointRoi-->
     <event NAME="StSMALERNMINUS1 " ID="1010" TYPE="Type_User" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />
     <event NAME="StLARGERNMINUS1" ID="1011" TYPE="Type_User" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />
     <!-- -->
     <event NAME="ActivateTool" ID="1300" TYPE="Type_User" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />
     <!-- -->
     <!-- Sonstiges -->
     <!--<event NAME="PositionEvent" ID="1012" TYPE="Type_MouseButtonPress" BUTTON="BS_LeftButton" BUTTONSTATE="0x0000" KEY="Key_none" />-->
     <!-- DoubleClick <event NAME="PositionEvent"      ID="510" TYPE="4" BUTTON="0x0001" BUTTONSTATE="0x0000" KEY="0xffff" />-->
     <!--<event NAME="StSmallerN" ID="1014" TYPE="Type_User" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />-->
     <!--<event NAME="StEqualsN" ID="1015" TYPE="Type_User" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />-->
     <!--<event NAME="StLargerN" ID="1016" TYPE="Type_User" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />-->
     <!-- for external thrown Events-->
     <event NAME="clear" ID="1100" TYPE="Type_User" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />
     <!-- Puncture Application -->
     <event NAME="print" ID="3001" TYPE="Type_Application" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_none" />
     <!-- A-->
     <event NAME="A" ID="4001" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_A" />
     <!-- B-->
     <event NAME="B" ID="4002" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_B" />
     <!-- C-->
     <event NAME="C" ID="4003" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_C" />
     <!-- D-->
     <event NAME="D" ID="4004" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_D" />
     <!-- F-->
     <event NAME="F" ID="4005" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_F" />
     <!-- G-->
     <event NAME="G" ID="4006" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_G" />
     <!-- I-->
     <event NAME="I" ID="4007" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_I" />
     <!-- J-->
     <event NAME="J" ID="4008" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_J" />
     <!-- K-->
     <event NAME="K" ID="4009" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_K" />
     <!-- L-->
     <event NAME="L" ID="4010" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_L" />        
     <!-- M-->
     <event NAME="M" ID="4011" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_M" />        
     <!-- O-->
     <event NAME="O" ID="4012" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_O" />        
     <!-- Q-->
     <event NAME="Q" ID="4013" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_Q" />        
     <!-- U-->
     <event NAME="U" ID="4014" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_U" />        
     <!-- V-->
     <event NAME="V" ID="4015" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_V" />
     <!-- W-->
     <event NAME="W" ID="4016" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_W" />                    
     <!-- X-->
     <event NAME="X" ID="4017" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_X" />                    
     <!-- Y-->
     <event NAME="Y" ID="4018" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_Y" />                    
     <!-- Z-->
     <event NAME="Z" ID="4019" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_Z" />
     <!-- 1-->
     <event NAME="1" ID="4020" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_1" />                    
     <!-- 2-->
     <event NAME="2" ID="4021" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_2" />                    
     <!-- 3-->
     <event NAME="3" ID="4022" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_3" />                    
     <!-- 4-->
     <event NAME="4" ID="4023" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_4" />                    
     <!-- 5-->
     <event NAME="5" ID="4024" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_5" />                    
     <!-- 6-->
     <event NAME="6" ID="4025" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_6" />                    
     <!-- 7-->
     <event NAME="7" ID="4026" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_7" />                    
     <!-- 8-->
     <event NAME="8" ID="4027" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_8" />                    
     <!-- 9-->
     <event NAME="9" ID="4028" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_9" />
     <!-- 0 (zero) -->
     <event NAME="0" ID="4029" TYPE="Type_KeyPress" BUTTON="BS_NoButton" BUTTONSTATE="0x0000" KEY="Key_0" />                                        
   </events>
+  
   <!-- Beginning of state machine patterns-->
   <!-- TutorialStep10Begin -->
   <stateMachine NAME="SelectAndMoveObjectWithArrowKeys">
     <state NAME="start" ID="1" START_STATE="TRUE" X_POS="3" Y_POS="40" WIDTH="100" HEIGHT="50">
       <transition NAME="CheckIfObjectIsPicked" NEXT_STATE_ID="2" EVENT_ID="1">
         <action ID="30" />
         <!-- 30 = AcCHECKELEMENT  -->
       </transition>
     </state>
     <state NAME="Guard_IsObjectPicked" ID="2" X_POS="282" Y_POS="23" WIDTH="126" HEIGHT="50">
       <transition NAME="yes" NEXT_STATE_ID="10" EVENT_ID="1004">
         <action ID="65" />
         <!-- AcSELECT  -->
         <action ID="1101" />
         <!--AcMODE_SELECT-->
       </transition>
       <transition NAME="no" NEXT_STATE_ID="1" EVENT_ID="1003">
         <action ID="75" />
         <!-- AcDESELECT  -->
         <action ID="1100" />
         <!--AcMODE_DESELECT-->
       </transition>
     </state>
     <state NAME="object selected" ID="10" X_POS="714" Y_POS="85" WIDTH="100" HEIGHT="50">
       <transition NAME="CheckIfObjectIsPicked" NEXT_STATE_ID="2" EVENT_ID="1">
         <action ID="30" />
         <!-- AcCHECKELEMENT  -->
       </transition>
       <transition NAME="z+" NEXT_STATE_ID="10" EVENT_ID="50">
         <action ID="92">
           <!-- AcMove  -->
           <intParameter NAME="DIRECTION_X" VALUE="0" />
           <intParameter NAME="DIRECTION_Y" VALUE="0" />
           <intParameter NAME="DIRECTION_Z" VALUE="1" />
         </action>
       </transition>
       <transition NAME="z-" NEXT_STATE_ID="10" EVENT_ID="51">
         <action ID="92">
           <!-- AcMove  -->
           <intParameter NAME="DIRECTION_X" VALUE="0" />
           <intParameter NAME="DIRECTION_Y" VALUE="0" />
           <intParameter NAME="DIRECTION_Z" VALUE="-1" />
         </action>
       </transition>
       <transition NAME="x+" NEXT_STATE_ID="10" EVENT_ID="52">
         <action ID="92">
           <!-- AcMove  -->
           <intParameter NAME="DIRECTION_X" VALUE="1" />
           <intParameter NAME="DIRECTION_Y" VALUE="0" />
           <intParameter NAME="DIRECTION_Z" VALUE="0" />
         </action>
       </transition>
       <transition NAME="x-" NEXT_STATE_ID="10" EVENT_ID="53">
         <action ID="92">
           <!-- AcMove  -->
           <intParameter NAME="DIRECTION_X" VALUE="-1" />
           <intParameter NAME="DIRECTION_Y" VALUE="0" />
           <intParameter NAME="DIRECTION_Z" VALUE="0" />
         </action>
       </transition>
       <transition NAME="y+" NEXT_STATE_ID="10" EVENT_ID="54">
         <action ID="92">
           <!-- AcMove  -->
           <intParameter NAME="DIRECTION_X" VALUE="0" />
           <intParameter NAME="DIRECTION_Y" VALUE="1" />
           <intParameter NAME="DIRECTION_Z" VALUE="0" />
         </action>
       </transition>
       <transition NAME="y-" NEXT_STATE_ID="10" EVENT_ID="55">
         <action ID="92">
           <!-- AcMove  -->
           <intParameter NAME="DIRECTION_X" VALUE="0" />
           <intParameter NAME="DIRECTION_Y" VALUE="-1" />
           <intParameter NAME="DIRECTION_Z" VALUE="0" />
         </action>
       </transition>
     </state>
   </stateMachine>
   <!-- TutorialStep10End -->
   <stateMachine NAME="AffineInteractions click to select">
     <state NAME="start" ID="1" START_STATE="TRUE" X_POS="3" Y_POS="40" WIDTH="100" HEIGHT="50">
       <transition NAME="leftButtonPress" NEXT_STATE_ID="2" EVENT_ID="1">
         <!-- 30 = SeCHECKELEMENT  -->
         <action ID="30" />
       </transition>
     </state>
     <state NAME="object selected check" ID="2" X_POS="282" Y_POS="23" WIDTH="126" HEIGHT="50">
       <transition NAME="yes" NEXT_STATE_ID="10" EVENT_ID="1004">
         <!-- EIDYES -->
         <action ID="0" />
       </transition>
       <transition NAME="no" NEXT_STATE_ID="1" EVENT_ID="1003">
         <!-- EIDNO -->
         <action ID="0" />
       </transition>
     </state>
     <state NAME="neutral" ID="10" X_POS="714" Y_POS="85" WIDTH="100" HEIGHT="50">
       <transition NAME="leftButtonPress" NEXT_STATE_ID="20" EVENT_ID="1">
         <!-- 30 = SeCHECKELEMENT  -->
         <action ID="30" />
       </transition>
       <transition NAME="rightButtonPress" NEXT_STATE_ID="31" EVENT_ID="2">
         <!-- 1002 = SeSCALESTART  -->
         <action ID="1002" />
       </transition>
       <transition NAME="middleButtonPress" NEXT_STATE_ID="41" EVENT_ID="4">
         <!-- 1004 = SeROTATESTART  -->
         <action ID="1004" />
       </transition>
     </state>
     <state NAME="object deselect check" ID="20" X_POS="57" Y_POS="396" WIDTH="122" HEIGHT="50">
       <transition NAME="yes" NEXT_STATE_ID="21" EVENT_ID="1004">
         <!-- 1000 = SeTRANSLATESTART -->
         <action ID="1000" />
       </transition>
       <transition NAME="no" NEXT_STATE_ID="1" EVENT_ID="1003">
         <!-- EIDNO -->
         <action ID="0" />
       </transition>
     </state>
     <state NAME="translating" ID="21" X_POS="203" Y_POS="150" WIDTH="100" HEIGHT="50">
       <transition NAME="leftButtonMove" NEXT_STATE_ID="21" EVENT_ID="530">
         <!-- 1001 = SeTRANSLATE  -->
         <action ID="1000" />
       </transition>
       <transition NAME="leftButtonRelease" NEXT_STATE_ID="10" EVENT_ID="505">
         <!-- 0 = no action  -->
         <action ID="0" />
       </transition>
     </state>
     <state NAME="scaling" ID="31" X_POS="347" Y_POS="459" WIDTH="100" HEIGHT="50">
       <transition NAME="rightButtonMove" NEXT_STATE_ID="31" EVENT_ID="531">
         <!-- 1003 = SeSCALE  -->
         <action ID="1003" />
       </transition>
       <transition NAME="rightButtonRelease" NEXT_STATE_ID="10" EVENT_ID="507">
         <!-- 0 = no action  -->
         <action ID="0" />
       </transition>
     </state>
     <state NAME="rotating" ID="41" X_POS="657" Y_POS="465" WIDTH="100" HEIGHT="50">
       <transition NAME="middleButtonMove" NEXT_STATE_ID="41" EVENT_ID="533">
         <!-- 1005 = SeROTATE  -->
         <action ID="1005" />
       </transition>
       <transition NAME="middleButtonRelease" NEXT_STATE_ID="10" EVENT_ID="506">
         <!-- 0 = no action  -->
         <action ID="0" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="AffineInteractions ctrl-drag">
     <!-- affine interactions standard statemachine  -->
     <state NAME="start" ID="0" START_STATE="TRUE" X_POS="29" Y_POS="70" WIDTH="100" HEIGHT="50">
       <transition NAME="leftButtonPress" NEXT_STATE_ID="12" EVENT_ID="5">
         <!-- CTRL+LBM_Down -->
         <action ID="30">
           <!--AcCHECKELEMENT-->
         </action>
       </transition>
       <transition NAME="leftButtonPress" NEXT_STATE_ID="12" EVENT_ID="540">
         <!-- SHIFT+CTRL+LBM_Down -->
         <action ID="11">
           <!--AcADD-->
         </action>
       </transition>
       <transition NAME="middleButtonPress" NEXT_STATE_ID="14" EVENT_ID="6">
         <!-- CTRL+MBM_Down -->
         <action ID="30">
           <!--AcCHECKELEMENT-->
         </action>
       </transition>
       <transition NAME="rightButtonPress" NEXT_STATE_ID="13" EVENT_ID="7">
         <!-- CTRL+RBM_Down -->
         <action ID="30">
           <!--AcCHECKELEMENT-->
         </action>
       </transition>
     </state>
     <state NAME="picked guard Translate" ID="12" X_POS="376" Y_POS="34" WIDTH="151" HEIGHT="50">
       <transition NAME="yes" NEXT_STATE_ID="2" EVENT_ID="1004">
         <!-- EIDYES -->
         <action ID="1101">
           <!--AcMODE_SELECT-->
         </action>
         <action ID="1000">
           <!--AcTRANSLATESTART-->
         </action>
       </transition>
       <transition NAME="no" NEXT_STATE_ID="0" EVENT_ID="1003">
         <!-- StNO -->
       </transition>
     </state>
     <state NAME="picked guard Scale" ID="13" X_POS="647" Y_POS="312" WIDTH="100" HEIGHT="50">
       <transition NAME="yes" NEXT_STATE_ID="3" EVENT_ID="1004">
         <!-- EIDYES -->
         <action ID="1101">
           <!--AcMODE_SELECT-->
         </action>
         <action ID="1002">
           <!--AcSCALESTART-->
         </action>
       </transition>
       <transition NAME="no" NEXT_STATE_ID="0" EVENT_ID="1003">
         <!-- StNO -->
         <action ID="0" />
       </transition>
     </state>
     <state NAME="picked guard Rotate" ID="14" X_POS="33" Y_POS="467" WIDTH="110" HEIGHT="50">
       <transition NAME="yes" NEXT_STATE_ID="4" EVENT_ID="1004">
         <!-- EIDYES -->
         <action ID="1101">
           <!--AcMODE_SELECT-->
         </action>
         <action ID="1004" />
       </transition>
       <transition NAME="no" NEXT_STATE_ID="0" EVENT_ID="1003">
         <!-- StNO -->
         <action ID="0" />
       </transition>
     </state>
     <state NAME="translating" ID="2" X_POS="724" Y_POS="59" WIDTH="100" HEIGHT="50">
       <transition NAME="leftButtonMove" NEXT_STATE_ID="2" EVENT_ID="534">
         <!-- CTRL+LBM_Move -->
         <action ID="1001">
           <!--AcTRANSLATE-->
         </action>
       </transition>
       <transition NAME="leftButtonRelease" NEXT_STATE_ID="0" EVENT_ID="505">
         <!-- LBM_Release-->
         <action ID="1100">
           <!--AcMODE_DESELECT-->
         </action>
         <action ID="1008">
           <!--AcTRANSLATEEND-->
         </action>
       </transition>
       <transition NAME="leftButtonRelease" NEXT_STATE_ID="0" EVENT_ID="537">
         <!-- CTRL+LBM_Release -->
         <action ID="1100">
           <!--AcMODE_DESELECT-->
         </action>
         <action ID="1008">
           <!--AcTRANSLATEEND-->
         </action>
       </transition>
     </state>
     <state NAME="rotating" ID="4" X_POS="371" Y_POS="481" WIDTH="100" HEIGHT="50">
       <transition NAME="middleButtonMove" NEXT_STATE_ID="4" EVENT_ID="536">
         <!-- CTRL+MBM_Move-->
         <action ID="1005">
           <!--AcROTATE-->
         </action>
       </transition>
       <transition NAME="middleButtonRelease" NEXT_STATE_ID="0" EVENT_ID="506">
         <!-- MBM_Release-->
         <action ID="1100">
           <!--AcMODE_DESELECT-->
         </action>
         <action ID="1010">
           <!--AcROTATEEEND-->
         </action>
       </transition>
       <transition NAME="middleButtonRelease" NEXT_STATE_ID="0" EVENT_ID="539">
         <!-- CTRL+MBM_Release-->
         <action ID="1100">
           <!--AcMODE_DESELECT-->
         </action>
         <action ID="1010">
           <!--AcROTATEEEND-->
         </action>
       </transition>
     </state>
     <state NAME="scaling" ID="3" X_POS="710" Y_POS="432" WIDTH="100" HEIGHT="50">
       <transition NAME="rightButtonMove" NEXT_STATE_ID="3" EVENT_ID="535">
         <!-- CTRL+RBM_Move -->
         <action ID="1003">
           <!--AcROTATE -->
         </action>
       </transition>
       <transition NAME="rightButtonRelease" NEXT_STATE_ID="0" EVENT_ID="507">
         <!-- RBM_Release ==> SeSCALE  -->
         <action ID="1100">
           <!--AcMODE_DESELECT-->
         </action>
         <action ID="1009">
           <!--AcSCALEEND-->
         </action>
       </transition>
       <transition NAME="rightButtonRelease" NEXT_STATE_ID="0" EVENT_ID="538">
         <!-- CTRL+RBM_Release ==> SeSCALE  -->
         <action ID="1100">
           <!--AcMODE_DESELECT-->
         </action>
         <action ID="1009">
           <!--AcSCALEEND-->
         </action>
       </transition>
     </state>
   </stateMachine>
   <!--  obsolete state machine pattern to be removed in future releases
  <stateMachine NAME="drag">
     <state NAME="neutral" ID="1" START_STATE="TRUE" X_POS="232" Y_POS="131" WIDTH="100" HEIGHT="50">
       <transition NAME="check picked" NEXT_STATE_ID="1" EVENT_ID="1">
         <action ID="80" />
       </transition>
       <transition NAME="continue" NEXT_STATE_ID="1" EVENT_ID="530">
         <action ID="90" />
       </transition>
       <transition NAME="exit" NEXT_STATE_ID="1" EVENT_ID="505">
         <action ID="42" />
       </transition>
     </state>
     <state NAME="picked guard" ID="2" X_POS="94" Y_POS="360" WIDTH="100" HEIGHT="50">
       <transition NAME="yes" NEXT_STATE_ID="3" EVENT_ID="1004">
         <action ID="0" />
       </transition>
       <transition NAME="no" NEXT_STATE_ID="3" EVENT_ID="1003">
         <action ID="0" />
       </transition>
     </state>
     <state NAME="move" ID="3" X_POS="368" Y_POS="289" WIDTH="100" HEIGHT="50">
       <transition NAME="continue" NEXT_STATE_ID="3" EVENT_ID="530">
         <action ID="90" />
       </transition>
       <transition NAME="exit" NEXT_STATE_ID="1" EVENT_ID="505">
         <action ID="42" />
       </transition>
     </state>
   </stateMachine>
 -->
   <stateMachine NAME="dragWithCtrl">
     <state NAME="neutral" ID="1" START_STATE="TRUE" X_POS="439" Y_POS="166" WIDTH="100" HEIGHT="50">
       <transition NAME="check picked" NEXT_STATE_ID="1" EVENT_ID="5">
         <action ID="80" />
       </transition>
       <transition NAME="continue" NEXT_STATE_ID="1" EVENT_ID="534">
         <action ID="90" />
       </transition>
       <transition NAME="exit" NEXT_STATE_ID="1" EVENT_ID="537">
         <action ID="42" />
       </transition>
       <transition NAME="exit" NEXT_STATE_ID="1" EVENT_ID="505">
         <action ID="42" />
       </transition>
       <transition NAME="remove" NEXT_STATE_ID="1" EVENT_ID="12">
         <action ID="100">
           <!--AcREMOVEPOINT-->
         </action>
       </transition>
     </state>
     <!-- not reached so removed!
     <state NAME="picked guard" ID="2" X_POS="141" Y_POS="427" WIDTH="100" HEIGHT="50">
       <transition NAME="yes" NEXT_STATE_ID="3" EVENT_ID="1004">
         <action ID="0" />
       </transition>
       <transition NAME="no" NEXT_STATE_ID="3" EVENT_ID="1003">
         <action ID="0" />
       </transition>
     </state>
     <state NAME="move" ID="3" X_POS="560" Y_POS="381" WIDTH="100" HEIGHT="50">
       <transition NAME="continue" NEXT_STATE_ID="3" EVENT_ID="534">
         <action ID="90" />
       </transition>
       <transition NAME="exit" NEXT_STATE_ID="1" EVENT_ID="505">
         <action ID="42" />
       </transition>
       <transition NAME="exit" NEXT_STATE_ID="1" EVENT_ID="537">
         <action ID="42" />
       </transition>
     </state>
 -->
   </stateMachine>
   <stateMachine NAME="focus">
     <state NAME="neutral" ID="1" START_STATE="TRUE" X_POS="250" Y_POS="191" WIDTH="100" HEIGHT="50">
       <transition NAME="changefocus" NEXT_STATE_ID="1" EVENT_ID="1">
         <action ID="0" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="global">
     <!-- Behaviour the global statemachine -->
     <state NAME="neutral" ID="1" START_STATE="TRUE" X_POS="203" Y_POS="168" WIDTH="100" HEIGHT="50">
       <transition NAME="edit objects" NEXT_STATE_ID="2" EVENT_ID="1013" />
       <!--EIDEDIT-->
       <transition NAME="transmitt to all" NEXT_STATE_ID="1" EVENT_ID="0">
         <!--EventId = 0-> all other events not defined here-->
         <action ID="1200">
           <!--AcINFORMLISTENERS-->
         </action>
         <action ID="1201">
           <!--AcASKINTERACTORS-->
         </action>
       </transition>
     </state>
     <state NAME="edit object" ID="2" X_POS="508" Y_POS="404" WIDTH="100" HEIGHT="50">
       <transition NAME="ready" NEXT_STATE_ID="1" EVENT_ID="1002" />
       <!--EIDFINISHED-->
       <transition NAME="transmitt to interactors only" NEXT_STATE_ID="2" EVENT_ID="0">
         <action ID="1201">
           <!--AcASKINTERACTORS-->
         </action>
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="leftmouse">
     <state NAME="neutral" ID="1" START_STATE="TRUE" X_POS="197" Y_POS="164" WIDTH="100" HEIGHT="50">
       <transition NAME="send Koordinates" NEXT_STATE_ID="1" EVENT_ID="1" SIDE_EFFECT_ID="80">
         <action ID="80" />
       </transition>
       <transition NAME="send Koordinates Move" NEXT_STATE_ID="1" EVENT_ID="530" SIDE_EFFECT_ID="80">
         <action ID="80" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="measureinteractor">
     <!-- Behaviour for measuring a length with lines-->
     <state NAME="unbuild" ID="0" START_STATE="TRUE" X_POS="167" Y_POS="49" WIDTH="100" HEIGHT="50">
       <transition NAME="forceSSD" NEXT_STATE_ID="1" EVENT_ID="3">
         <action ID="5">
           <!--AcINITNEWOBJECT-->
         </action>
         <action ID="1550">
           <!--AcFORCESUBINTERACTORS-->
         </action>
         <action ID="1102">
           <!--AcMODESUBSELECT-->
         </action>
         <action ID="2000">
           <!--AcTRANSMITEVENT-->
         </action>
       </transition>
     </state>
     <state NAME="BuildUpSSD" ID="1" X_POS="433" Y_POS="329" WIDTH="100" HEIGHT="50">
       <transition NAME="SubInteractorDeselect" NEXT_STATE_ID="10" EVENT_ID="1020">
         <!-- necessary transition of the state subSelected. the event will produced from the hirachical interactor -->
         <action ID="1101">
           <!--AcMODEDESELECT-->
         </action>
       </transition>
       <transition NAME="reinit" NEXT_STATE_ID="0" EVENT_ID="2">
         <action ID="101" />
         <action ID="1100">
           <!--AcMODEDESELECT-->
         </action>
       </transition>
     </state>
     <state NAME="selected" ID="10" X_POS="617" Y_POS="56" WIDTH="100" HEIGHT="50">
       <transition NAME="remove" NEXT_STATE_ID="0" EVENT_ID="12">
         <action ID="101" />
         <action ID="1100">
           <!--AcMODEDESELECT-->
         </action>
       </transition>
       <transition NAME="reinit" NEXT_STATE_ID="0" EVENT_ID="2">
         <action ID="101" />
         <action ID="1100">
           <!--AcMODEDESELECT-->
         </action>
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="meshmove">
     <state NAME="neutral" ID="1" START_STATE="TRUE" X_POS="193" Y_POS="74" WIDTH="100" HEIGHT="50">
       <transition NAME="check picked" NEXT_STATE_ID="2" EVENT_ID="1">
         <action ID="30" />
       </transition>
     </state>
     <state NAME="picked guard" ID="2" X_POS="98" Y_POS="296" WIDTH="100" HEIGHT="50">
       <transition NAME="yes" NEXT_STATE_ID="3" EVENT_ID="1004">
         <action ID="0" />
       </transition>
       <transition NAME="no" NEXT_STATE_ID="1" EVENT_ID="1003">
         <action ID="0" />
       </transition>
     </state>
     <state NAME="move" ID="3" X_POS="467" Y_POS="276" WIDTH="100" HEIGHT="50">
       <transition NAME="continue" NEXT_STATE_ID="3" EVENT_ID="530">
         <action ID="90" />
       </transition>
       <transition NAME="exit" NEXT_STATE_ID="1" EVENT_ID="505">
         <action ID="666" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="navigation">
     <state NAME="neutral" ID="1" START_STATE="TRUE" X_POS="189" Y_POS="175" WIDTH="100" HEIGHT="50">
       <transition NAME="send Koordinates press" NEXT_STATE_ID="1" EVENT_ID="1">
         <action ID="92" />
       </transition>
       <transition NAME="send Koordinates move" NEXT_STATE_ID="1" EVENT_ID="530">
         <action ID="92" />
       </transition>
       <transition NAME="send Koordinates release" NEXT_STATE_ID="1" EVENT_ID="505">
         <action ID="42" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="PositionTracker">
     <state NAME="neutral" ID="1" START_STATE="TRUE" X_POS="212" Y_POS="188" WIDTH="100" HEIGHT="50">
       <transition NAME="Mouse Move" EVENT_ID="520" NEXT_STATE_ID="1">
         <action ID="92">
           <!--AcMove-->
         </action>
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="picking">
     <state NAME="neutral" ID="1" START_STATE="TRUE" X_POS="264" Y_POS="239" WIDTH="100" HEIGHT="50">
       <transition NAME="do picking" NEXT_STATE_ID="1" EVENT_ID="3">
         <action ID="1003" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="PressMoveRelease">
     <state NAME="neutral" ID="1" START_STATE="TRUE" X_POS="197" Y_POS="183" WIDTH="100" HEIGHT="50">
       <transition NAME="send Koordinates press" NEXT_STATE_ID="1" EVENT_ID="1">
         <action ID="80" />
       </transition>
       <transition NAME="send Koordinates move" NEXT_STATE_ID="1" EVENT_ID="530">
         <action ID="90" />
       </transition>
       <transition NAME="send Koordinates release" NEXT_STATE_ID="1" EVENT_ID="505">
         <action ID="42" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="PressMoveReleaseAndPointSetting">
     <state NAME="neutral" ID="1" START_STATE="TRUE">
       <transition NAME="press" NEXT_STATE_ID="1" EVENT_ID="1">
         <action ID="80" />
       </transition>
       <transition NAME="Shift+press" NEXT_STATE_ID="1" EVENT_ID="3">
         <action ID="10" />
       </transition>
       <transition NAME="move" NEXT_STATE_ID="1" EVENT_ID="530">
         <action ID="90" />
       </transition>
       <transition NAME="release" NEXT_STATE_ID="1" EVENT_ID="505">
         <action ID="42" />
       </transition>
       <transition NAME="ENTF" NEXT_STATE_ID="1" EVENT_ID="12">
         <action ID="100" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="PressMoveReleaseWithCTRLInversionAllMouseMoves">
     <state NAME="neutral" ID="1" START_STATE="TRUE">
       <transition NAME="press" NEXT_STATE_ID="1" EVENT_ID="1">
         <action ID="80" />
       </transition>
       <transition NAME="CTRL+press" NEXT_STATE_ID="2" EVENT_ID="5">
         <action ID="80" />
         <action ID="49014" />
       </transition>
       <transition NAME="move w/ left button" NEXT_STATE_ID="1" EVENT_ID="530">
         <action ID="90" />
       </transition>
       <transition NAME="move" NEXT_STATE_ID="1" EVENT_ID="520">
         <action ID="90" />
       </transition>
       <transition NAME="CTRL+move" NEXT_STATE_ID="2" EVENT_ID="534">
         <action ID="90" />
         <action ID="49014" />
       </transition>
       <transition NAME="release" NEXT_STATE_ID="1" EVENT_ID="505">
         <action ID="42" />
       </transition>
       <transition NAME="CTRL+release" NEXT_STATE_ID="1" EVENT_ID="537">
         <action ID="49014" />
         <action ID="42" />
         <action ID="49014" />
       </transition>
     </state>
     <state NAME="inverted" ID="2">
       <transition NAME="CTRL+move" NEXT_STATE_ID="2" EVENT_ID="534">
         <action ID="90" />
       </transition>
       <transition NAME="move w/o left button" NEXT_STATE_ID="1" EVENT_ID="520">
         <action ID="90" />
         <action ID="49014" />
       </transition>
       <transition NAME="move" NEXT_STATE_ID="1" EVENT_ID="530">
         <action ID="90" />
         <action ID="49014" />
       </transition>
       <transition NAME="CTRL+release" NEXT_STATE_ID="1" EVENT_ID="537">
         <action ID="42" />
         <action ID="49014" />
       </transition>
       <transition NAME="release" NEXT_STATE_ID="1" EVENT_ID="505">
         <action ID="42" />
         <action ID="49014" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="PressMoveReleaseWithCTRLInversion">
     <state NAME="neutral" ID="1" START_STATE="TRUE">
       <transition NAME="press" NEXT_STATE_ID="1" EVENT_ID="1">
         <action ID="80" />
       </transition>
       <transition NAME="CTRL+press" NEXT_STATE_ID="2" EVENT_ID="5">
         <action ID="80" />
         <action ID="49014" />
       </transition>
       <transition NAME="move w/ left button" NEXT_STATE_ID="1" EVENT_ID="530">
         <action ID="90" />
       </transition>
       <transition NAME="CTRL+move" NEXT_STATE_ID="2" EVENT_ID="534">
         <action ID="90" />
         <action ID="49014" />
       </transition>
       <transition NAME="release" NEXT_STATE_ID="1" EVENT_ID="505">
         <action ID="42" />
       </transition>
       <transition NAME="CTRL+release" NEXT_STATE_ID="1" EVENT_ID="537">
         <action ID="49014" />
         <action ID="42" />
         <action ID="49014" />
       </transition>
     </state>
     <state NAME="inverted" ID="2">
       <transition NAME="CTRL+move" NEXT_STATE_ID="2" EVENT_ID="534">
         <action ID="90" />
       </transition>
       <transition NAME="move" NEXT_STATE_ID="1" EVENT_ID="530">
         <action ID="90" />
         <action ID="49014" />
       </transition>
       <transition NAME="CTRL+release" NEXT_STATE_ID="1" EVENT_ID="537">
         <action ID="42" />
         <action ID="49014" />
       </transition>
       <transition NAME="release" NEXT_STATE_ID="1" EVENT_ID="505">
         <action ID="42" />
         <action ID="49014" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="seedroi">
     <state NAME="neutral" ID="1" START_STATE="TRUE" X_POS="381" Y_POS="315" WIDTH="100" HEIGHT="50">
       <transition NAME="send Koordinates" NEXT_STATE_ID="1" EVENT_ID="3">
         <action ID="80" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="seedsinteractor">
     <!-- Behaviour of Seed Points -->
     <state NAME="drawSeeds" ID="0" START_STATE="TRUE" X_POS="125" Y_POS="102" WIDTH="100" HEIGHT="50">
       <transition NAME="drawForegroundSeed" NEXT_STATE_ID="1" EVENT_ID="3">
         <action ID="1101">
           <!--AcMODE_SELECT-->
         </action>
         <action ID="45">
           <!--AcINITFOREGROUND-->
         </action>
         <action ID="11">
           <!--AcADD-->
         </action>
       </transition>
       <transition NAME="drawBackgroundSeed" NEXT_STATE_ID="2" EVENT_ID="2000">
         <action ID="1101">
           <!--AcMODE_SELECT-->
         </action>
         <action ID="46">
           <!--AcINITBACKGROUND-->
         </action>
         <action ID="11">
           <!--AcADD-->
         </action>
       </transition>
       <transition NAME="drawNeutralSeed" NEXT_STATE_ID="3" EVENT_ID="2003">
         <action ID="1101">
           <!--AcMODE_SELECT-->
         </action>
         <action ID="47">
           <!--AcINITNEUTRAL-->
         </action>
         <action ID="11">
           <!--AcADD-->
         </action>
       </transition>
     </state>
     <state NAME="drawForeground" ID="1" X_POS="515" Y_POS="108" WIDTH="100" HEIGHT="50">
       <transition NAME="drawForegroundSeeds" NEXT_STATE_ID="1" EVENT_ID="541">
         <action ID="92">
           <!--AcMOVE-->
         </action>
       </transition>
       <transition NAME="drawSeeds" NEXT_STATE_ID="0" EVENT_ID="508">
         <action ID="44">
           <!--AcFINISH-->
         </action>
         <action ID="1100">
           <!--AcMODE_DESELECT-->
         </action>
       </transition>
     </state>
     <state NAME="drawBackground" ID="2" X_POS="510" Y_POS="323" WIDTH="100" HEIGHT="50">
       <transition NAME="drawBackgroundSeeds" NEXT_STATE_ID="2" EVENT_ID="2001">
         <action ID="92">
           <!--AcMOVE-->
         </action>
       </transition>
       <transition NAME="drawSeeds" NEXT_STATE_ID="0" EVENT_ID="2002">
         <action ID="44">
           <!--AcFINISH-->
         </action>
         <action ID="1100">
           <!--AcMODE_DESELECT-->
         </action>
       </transition>
     </state>
     <state NAME="drawNeutral" ID="3" X_POS="290" Y_POS="478" WIDTH="100" HEIGHT="50">
       <transition NAME="drawNeutralSeeds" NEXT_STATE_ID="3" EVENT_ID="2004">
         <action ID="92">
           <!--AcMOVE-->
         </action>
       </transition>
       <transition NAME="drawSeeds" NEXT_STATE_ID="0" EVENT_ID="2005">
         <action ID="44">
           <!--AcFINISH-->
         </action>
         <action ID="1100">
           <!--AcMODE_DESELECT-->
         </action>
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="vesseltreeinteraction">
     <state NAME="neutral" ID="1" START_STATE="TRUE" X_POS="268" Y_POS="260" WIDTH="100" HEIGHT="50">
       <transition NAME="do picking" NEXT_STATE_ID="1" EVENT_ID="5">
         <action ID="1600" />
       </transition>
       <transition NAME="do picking" NEXT_STATE_ID="1" EVENT_ID="8">
         <action ID="1600" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="YetAnotherVesselTreeInteractor">
     <!-- state machine for vessel TREE interaction -->
     <state NAME="no-vessel-picked" ID="0" START_STATE="TRUE" X_POS="282" Y_POS="146" WIDTH="100" HEIGHT="50">
       <transition NAME="checkpicked" NEXT_STATE_ID="1" EVENT_ID="5">
         <action ID="30">
           <!--AcCHECKELEMENT-->
         </action>
       </transition>
       <transition NAME="checkpicked" NEXT_STATE_ID="1" EVENT_ID="8">
         <action ID="30">
           <!--AcCHECKELEMENT-->
         </action>
       </transition>
     </state>
     <state NAME="check-guard" ID="1" X_POS="91" Y_POS="347" WIDTH="100" HEIGHT="50">
       <transition NAME="check-successful" NEXT_STATE_ID="2" EVENT_ID="1004">
         <action ID="65">
           <!--AcSELECT-->
         </action>
       </transition>
       <transition NAME="check-not-successful" NEXT_STATE_ID="0" EVENT_ID="1003">
         <action ID="75">
           <!--AcDESELECT-->
         </action>
       </transition>
     </state>
     <state NAME="vessel-picked" ID="2" X_POS="419" Y_POS="340" WIDTH="100" HEIGHT="50">
       <transition NAME="checkpicked" NEXT_STATE_ID="1" EVENT_ID="5">
         <action ID="30">
           <!--AcCHECKELEMENT-->
         </action>
       </transition>
       <transition NAME="checkpicked" NEXT_STATE_ID="1" EVENT_ID="8">
         <action ID="30">
           <!--AcCHECKELEMENT-->
         </action>
       </transition>
     </state>
   </stateMachine>
   <!-- state machine for vessel TREE interaction with multiple selection -->
   <stateMachine NAME="YetAnotherVesselTreeInteractorMultipleSelection">
     <state NAME="no-vessel-picked" ID="0" START_STATE="TRUE" X_POS="282" Y_POS="146" WIDTH="100" HEIGHT="50">
       <transition NAME="checkpicked" NEXT_STATE_ID="1" EVENT_ID="5">
         <action ID="30">
           <!--AcCHECKELEMENT-->
         </action>
       </transition>
       <transition NAME="checkpicked" NEXT_STATE_ID="1" EVENT_ID="8">
         <action ID="30">
           <!--AcCHECKELEMENT-->
         </action>
       </transition>
     </state>
     <state NAME="CheckPicked-GuardState" ID="1" X_POS="91" Y_POS="347" WIDTH="100" HEIGHT="50">
       <transition NAME="picked-vessel" NEXT_STATE_ID="2" EVENT_ID="1004">
         <action ID="65">
           <!--AcSELECT-->
         </action>
       </transition>
       <transition NAME="no-vessel-picked" NEXT_STATE_ID="0" EVENT_ID="1003">
         <action ID="75">
           <!--AcDESELECT-->
         </action>
       </transition>
     </state>
     <state NAME="vessel-selected" ID="2" X_POS="419" Y_POS="340" WIDTH="100" HEIGHT="50">
       <transition NAME="checkpicked" NEXT_STATE_ID="3" EVENT_ID="5">
         <action ID="30">
           <!--AcCHECKELEMENT-->
         </action>
       </transition>
       <transition NAME="checkpicked" NEXT_STATE_ID="1" EVENT_ID="8">
         <action ID="30">
           <!--AcCHECKELEMENT-->
         </action>
       </transition>
     </state>
     <state NAME="guard-add-vessel2selection" ID="3" X_POS="419" Y_POS="340" WIDTH="100" HEIGHT="50">
       <transition NAME="vessel-picked" NEXT_STATE_ID="2" EVENT_ID="1004">
         <action ID="61">
           <!--AcSELECTANOTHEROBJECT-->
         </action>
       </transition>
       <transition NAME="no-vessel-picked" NEXT_STATE_ID="2" EVENT_ID="1003" />
     </state>
   </stateMachine>
   <stateMachine NAME="AriadneAssistent">
     <!-- Behaviour of the AriadneAssistent -->
     <state NAME="start" ID="1" START_STATE="TRUE" X_POS="500" Y_POS="530" WIDTH="100" HEIGHT="50">
       <transition NAME="EV_INIT" NEXT_STATE_ID="2" EVENT_ID="5551001">
         <action ID="55500010">
           <!--AC_INIT-->
         </action>
       </transition>
     </state>
     <state NAME="chooseApplication" ID="2" X_POS="616" Y_POS="351" WIDTH="100" HEIGHT="50">
       <transition NAME="EV_PATH_COLLECTION_SELECTED" NEXT_STATE_ID="3" EVENT_ID="5551003">
         <action ID="5550001">
           <!--AC_SET_NEXT_BUTTON_VISIBLE-->
         </action>
       </transition>
       <transition NAME="EV_NAVIGATION_SELECTED" NEXT_STATE_ID="40" EVENT_ID="5551004">
         <action ID="5550001">
           <!--AC_SET_NEXT_BUTTON_VISIBLE-->
         </action>
       </transition>
     </state>
     <state NAME="choosePathCollection" ID="3" X_POS="657" Y_POS="23" WIDTH="126" HEIGHT="50">
       <transition NAME="EV_NEXT" NEXT_STATE_ID="4" EVENT_ID="5551007">
         <action ID="5550003">
           <!--AC_SET_PREVIOUS_BUTTON_VISIBLE-->
         </action>
         <action ID="5550002">
           <!--AC_SET_NEXT_BUTTON_INVISIBLE-->
         </action>
         <action ID="5550005">
           <!--AC_SET_ASSISTAND_WIDGET_STECK-->
           <intParameter NAME="WIDGET_ID" VALUE="1" />
         </action>
       </transition>
       <transition NAME="EV_NAVIGATION_SELECTED" NEXT_STATE_ID="40" EVENT_ID="5551004" />
       <transition NAME="EV_INIT" NEXT_STATE_ID="2" EVENT_ID="5551001">
         <action ID="55500010">
           <!--AC_INIT-->
         </action>
       </transition>
     </state>
     <state NAME="mountSensorForPathCollection" ID="4" X_POS="331" Y_POS="11" WIDTH="167" HEIGHT="50">
       <transition NAME="EV_DONE" NEXT_STATE_ID="5" EVENT_ID="5551008">
         <action ID="5550001">
           <!--AC_SET_NEXT_BUTTON_VISIBLE-->
         </action>
       </transition>
       <transition NAME="EV_PREVIOUS" NEXT_STATE_ID="2" EVENT_ID="5551002">
         <action ID="5550004">
           <!--AC_SET_PREVIOUS_BUTTON_INVISIBLE-->
         </action>
         <action ID="5550001">
           <!--AC_SET_NEXT_BUTTON_VISIBLE-->
         </action>
         <action ID="55500011">
           <!--AC_SET_APPLICATION_SELECTED_FALSE-->
         </action>
         <action ID="5550005">
           <!--AC_SET_ASSISTAND_WIDGET_STECK-->
           <intParameter NAME="WIDGET_ID" VALUE="0" />
         </action>
       </transition>
       <transition NAME="EV_INIT" NEXT_STATE_ID="2" EVENT_ID="5551001">
         <action ID="55500010">
           <!--AC_INIT-->
         </action>
       </transition>
     </state>
     <state NAME="sensorMountedForPathCollection" ID="5" X_POS="7" Y_POS="26" WIDTH="191" HEIGHT="50">
       <transition NAME="EV_NEXT" NEXT_STATE_ID="7" EVENT_ID="5551007">
         <action ID="5550002">
           <!--AC_SET_NEXT_BUTTON_INVISIBLE-->
         </action>
         <action ID="55500012">
           <!--AC_SENSOR_ATTACHED-->
         </action>
         <action ID="5550005">
           <!--AC_SET_ASSISTAND_WIDGET_STECK-->
           <intParameter NAME="WIDGET_ID" VALUE="2" />
         </action>
         <action ID="5550008">
           <!--AC_CHECK_LANDMARK_COUNT-->
           <intParameter NAME="MIN_COUNT" VALUE="3" />
         </action>
       </transition>
       <transition NAME="EV_PREVIOUS" NEXT_STATE_ID="4" EVENT_ID="5551002">
         <action ID="5550009">
           <!--AC_SET_DONE_FALSE-->
         </action>
         <action ID="5550002">
           <!--AC_SET_NEXT_BUTTON_INVISIBLE-->
         </action>
       </transition>
       <transition NAME="EV_INIT" NEXT_STATE_ID="2" EVENT_ID="5551001">
         <action ID="55500010">
           <!--AC_INIT-->
         </action>
       </transition>
     </state>
     <state NAME="setLandmarks" ID="6" X_POS="229" Y_POS="369" WIDTH="100" HEIGHT="50">
       <transition NAME="EV_NEW_LANDMARK" NEXT_STATE_ID="7" EVENT_ID="5551009">
         <action ID="5550008">
           <!--AC_CHECK_LANDMARK_COUNT-->
           <intParameter NAME="MIN_COUNT" VALUE="3" />
         </action>
       </transition>
       <transition NAME="EV_PREVIOUS" NEXT_STATE_ID="4" EVENT_ID="5551002">
         <action ID="5550005">
           <!--AC_SET_ASSISTAND_WIDGET_STECK-->
           <intParameter NAME="WIDGET_ID" VALUE="1" />
         </action>
         <action ID="5550009">
           <!--AC_SET_DONE_FALSE-->
         </action>
       </transition>
       <transition NAME="EV_INIT" NEXT_STATE_ID="2" EVENT_ID="5551001">
         <action ID="55500010">
           <!--AC_INIT-->
         </action>
       </transition>
     </state>
     <state NAME="checkCount" ID="7" X_POS="-5" Y_POS="255" WIDTH="100" HEIGHT="50">
       <transition NAME="EV_READY_FOR_COLLECTING_PATH" NEXT_STATE_ID="8" EVENT_ID="5551006">
         <action ID="5550001">
           <!--AC_SET_NEXT_BUTTON_VISIBLE-->
         </action>
       </transition>
       <transition NAME="EV_LESS_THEN_MIN_COUNT" NEXT_STATE_ID="6" EVENT_ID="5551005" />
       <transition NAME="EV_INIT" NEXT_STATE_ID="2" EVENT_ID="5551001">
         <action ID="55500010">
           <!--AC_INIT-->
         </action>
       </transition>
     </state>
     <state NAME="readyForCollectingPath" ID="8" X_POS="-5" Y_POS="462" WIDTH="146" HEIGHT="50">
       <transition NAME="EV_NEXT" NEXT_STATE_ID="9" EVENT_ID="5551007">
         <action ID="5550005">
           <!--AC_SET_ASSISTAND_WIDGET_STECK-->
           <intParameter NAME="WIDGET_ID" VALUE="4" />
         </action>
         <action ID="55500014">
           <!--AC_START_APPLICATION_TEXT-->
           <stringParameter NAME="START_APPLICATION_TEXT" VALUE="Ariadne is now ready for path collection" />
         </action>
         <action ID="5550007">
           <!--AC_SET_NEXT_BUTTON_TEXT-->
           <stringParameter NAME="BUTTON_TEXT" VALUE="Start" />
         </action>
       </transition>
       <transition NAME="EV_PREVIOUS" NEXT_STATE_ID="4" EVENT_ID="5551002">
         <action ID="5550005">
           <!--AC_SET_ASSISTAND_WIDGET_STECK-->
           <intParameter NAME="WIDGET_ID" VALUE="1" />
         </action>
         <action ID="5550002">
           <!--AC_SET_NEXT_BUTTON_INVISIBLE-->
         </action>
         <action ID="5550009">
           <!--AC_SET_DONE_FALSE-->
         </action>
       </transition>
       <transition NAME="EV_REMOVE_LANDMARK" NEXT_STATE_ID="7" EVENT_ID="5551010">
         <action ID="5550002">
           <!--AC_SET_NEXT_BUTTON_INVISIBLE-->
         </action>
         <action ID="5550007">
           <!--AC_SET_NEXT_BUTTON_TEXT-->
           <stringParameter NAME="BUTTON_TEXT" VALUE="&gt;" />
         </action>
         <action ID="5550008">
           <!--AC_CHECK_LANDMARK_COUNT-->
           <intParameter NAME="MIN_COUNT" VALUE="3" />
         </action>
       </transition>
       <transition NAME="EV_INIT" NEXT_STATE_ID="2" EVENT_ID="5551001">
         <action ID="55500010">
           <!--AC_INIT-->
         </action>
       </transition>
     </state>
     <state NAME="collectingPath" ID="9" X_POS="30" Y_POS="607" WIDTH="100" HEIGHT="50">
       <transition NAME="EV_NEXT" NEXT_STATE_ID="2" EVENT_ID="5551007">
         <action ID="55500013">
           <!--AC_CLOSE_ASSISTENT-->
         </action>
         <action ID="55500011">
           <!--AC_SET_APPLICATION_SELECTED_FALSE-->
         </action>
         <action ID="5550002">
           <!--AC_SET_NEXT_BUTTON_INVISIBLE-->
         </action>
         <action ID="5550004">
           <!--AC_SET_PREVIOUS_BUTTON_INVISIBLE-->
         </action>
         <action ID="55500016">
           <!--AC_START_PATHCOLLECTION-->
         </action>
         <action ID="5550005">
           <!--AC_SET_ASSISTAND_WIDGET_STECK-->
           <intParameter NAME="WIDGET_ID" VALUE="0" />
         </action>
         <action ID="5550007">
           <!--AC_SET_NEXT_BUTTON_TEXT-->
           <stringParameter NAME="BUTTON_TEXT" VALUE="&gt;" />
         </action>
       </transition>
       <transition NAME="EV_PREVIOUS" NEXT_STATE_ID="8" EVENT_ID="5551002">
         <action ID="5550005">
           <!--AC_SET_ASSISTAND_WIDGET_STECK-->
           <intParameter NAME="WIDGET_ID" VALUE="2" />
         </action>
         <action ID="5550007">
           <!--AC_SET_NEXT_BUTTON_TEXT-->
           <stringParameter NAME="BUTTON_TEXT" VALUE="&gt;" />
         </action>
       </transition>
       <transition NAME="EV_INIT" NEXT_STATE_ID="2" EVENT_ID="5551001">
         <action ID="55500010">
           <!--AC_INIT-->
         </action>
         <action ID="5550007">
           <!--AC_SET_NEXT_BUTTON_TEXT-->
           <stringParameter NAME="BUTTON_TEXT" VALUE="&gt;" />
         </action>
       </transition>
     </state>
     <state NAME="chooseNavigation" ID="40" X_POS="1080" Y_POS="38" WIDTH="100" HEIGHT="50">
       <transition NAME="EV_PATH_COLLECTION_SELECTED" NEXT_STATE_ID="3" EVENT_ID="5551003" />
       <transition NAME="EV_INIT" NEXT_STATE_ID="2" EVENT_ID="5551001">
         <action ID="55500010">
           <!--AC_INIT-->
         </action>
       </transition>
       <transition NAME="EV_NEXT" NEXT_STATE_ID="41" EVENT_ID="5551007">
         <action ID="5550003">
           <!--AC_SET_PREVIOUS_BUTTON_VISIBLE-->
         </action>
         <action ID="5550002">
           <!--AC_SET_NEXT_BUTTON_INVISIBLE-->
         </action>
         <action ID="5550005">
           <!--AC_SET_ASSISTAND_WIDGET_STECK-->
           <intParameter NAME="WIDGET_ID" VALUE="3" />
         </action>
       </transition>
       <transition NAME="EV_INIT" NEXT_STATE_ID="2" EVENT_ID="5551001">
         <action ID="55500010">
           <!--AC_INIT-->
         </action>
       </transition>
     </state>
     <state NAME="chooseData" ID="41" X_POS="1100" Y_POS="199" WIDTH="100" HEIGHT="50">
       <transition NAME="EV_DONE" NEXT_STATE_ID="42" EVENT_ID="5551008">
         <action ID="5550001">
           <!--AC_SET_NEXT_BUTTON_VISIBLE-->
         </action>
       </transition>
       <transition NAME="EV_PREVIOUS" NEXT_STATE_ID="2" EVENT_ID="5551002">
         <action ID="5550004">
           <!--AC_SET_PREVIOUS_BUTTON_INVISIBLE-->
         </action>
         <action ID="5550001">
           <!--AC_SET_NEXT_BUTTON_VISIBLE-->
         </action>
         <action ID="55500011">
           <!--AC_SET_APPLICATION_SELECTED_FALSE-->
         </action>
         <action ID="5550005">
           <!--AC_SET_ASSISTAND_WIDGET_STECK-->
           <intParameter NAME="WIDGET_ID" VALUE="0" />
         </action>
       </transition>
       <transition NAME="EV_INIT" NEXT_STATE_ID="2" EVENT_ID="5551001">
         <action ID="55500010">
           <!--AC_INIT-->
         </action>
       </transition>
     </state>
     <state NAME="dataChoosed" ID="42" X_POS="1111" Y_POS="353" WIDTH="100" HEIGHT="50">
       <transition NAME="EV_NEXT" NEXT_STATE_ID="43" EVENT_ID="5551007">
         <action ID="55500017">
           <!--AC_LOAD_LANDMARKS-->
         </action>
         <action ID="5550002">
           <!--AC_SET_NEXT_BUTTON_INVISIBLE-->
         </action>
         <action ID="5550005">
           <!--AC_SET_ASSISTAND_WIDGET_STECK-->
           <intParameter NAME="WIDGET_ID" VALUE="1" />
         </action>
       </transition>
       <transition NAME="EV_PREVIOUS" NEXT_STATE_ID="2" EVENT_ID="5551002">
         <action ID="5550004">
           <!--AC_SET_PREVIOUS_BUTTON_INVISIBLE-->
         </action>
         <action ID="5550001">
           <!--AC_SET_NEXT_BUTTON_VISIBLE-->
         </action>
         <action ID="55500011">
           <!--AC_SET_APPLICATION_SELECTED_FALSE-->
         </action>
         <action ID="5550005">
           <!--AC_SET_ASSISTAND_WIDGET_STECK-->
           <intParameter NAME="WIDGET_ID" VALUE="0" />
         </action>
       </transition>
       <transition NAME="EV_INIT" NEXT_STATE_ID="2" EVENT_ID="5551001">
         <action ID="55500010">
           <!--AC_INIT-->
         </action>
       </transition>
     </state>
     <state NAME="mountSensorForNavigation" ID="43" X_POS="1059" Y_POS="473" WIDTH="144" HEIGHT="50">
       <transition NAME="EV_DONE" NEXT_STATE_ID="44" EVENT_ID="5551008">
         <action ID="5550001">
           <!--AC_SET_NEXT_BUTTON_VISIBLE-->
         </action>
       </transition>
       <transition NAME="EV_PREVIOUS" NEXT_STATE_ID="42" EVENT_ID="5551002">
         <action ID="5550001">
           <!--AC_SET_NEXT_BUTTON_VISIBLE-->
         </action>
         <action ID="5550005">
           <!--AC_SET_ASSISTAND_WIDGET_STECK-->
           <intParameter NAME="WIDGET_ID" VALUE="3" />
         </action>
       </transition>
       <transition NAME="EV_INIT" NEXT_STATE_ID="2" EVENT_ID="5551001">
         <action ID="55500010">
           <!--AC_INIT-->
         </action>
       </transition>
     </state>
     <state NAME="sensorMountedForNavigation" ID="44" X_POS="844" Y_POS="613" WIDTH="100" HEIGHT="50">
       <transition NAME="EV_NEXT" NEXT_STATE_ID="46" EVENT_ID="5551007">
         <action ID="5550002">
           <!--AC_SET_NEXT_BUTTON_INVISIBLE-->
         </action>
         <action ID="55500012">
           <!--AC_SENSOR_ATTACHED-->
         </action>
         <action ID="5550005">
           <!--AC_SET_ASSISTAND_WIDGET_STECK-->
           <intParameter NAME="WIDGET_ID" VALUE="2" />
         </action>
         <action ID="5550008">
           <!--AC_CHECK_LANDMARK_COUNT-->
           <intParameter NAME="MIN_COUNT" VALUE="3" />
         </action>
       </transition>
       <transition NAME="EV_PREVIOUS" NEXT_STATE_ID="43" EVENT_ID="5551002">
         <action ID="5550009">
           <!--AC_SET_DONE_FALSE-->
         </action>
         <action ID="5550002">
           <!--AC_SET_NEXT_BUTTON_INVISIBLE-->
         </action>
       </transition>
       <transition NAME="EV_INIT" NEXT_STATE_ID="2" EVENT_ID="5551001">
         <action ID="55500010">
           <!--AC_INIT-->
         </action>
       </transition>
     </state>
     <state NAME="setLandmarks" ID="45" X_POS="1110" Y_POS="754" WIDTH="100" HEIGHT="50">
       <transition NAME="EV_NEW_LANDMARK" NEXT_STATE_ID="46" EVENT_ID="5551009">
         <action ID="5550008">
           <!--AC_CHECK_LANDMARK_COUNT-->
           <intParameter NAME="MIN_COUNT" VALUE="3" />
         </action>
       </transition>
       <transition NAME="EV_PREVIOUS" NEXT_STATE_ID="43" EVENT_ID="5551002">
         <action ID="5550005">
           <!--AC_SET_ASSISTAND_WIDGET_STECK-->
           <intParameter NAME="WIDGET_ID" VALUE="3" />
         </action>
         <action ID="5550009">
           <!--AC_SET_DONE_FALSE-->
         </action>
       </transition>
       <transition NAME="EV_INIT" NEXT_STATE_ID="2" EVENT_ID="5551001">
         <action ID="55500010">
           <!--AC_INIT-->
         </action>
       </transition>
     </state>
     <state NAME="checkCount" ID="46" X_POS="615" Y_POS="748" WIDTH="100" HEIGHT="50">
       <transition NAME="EV_READY_FOR_COLLECTING_PATH" NEXT_STATE_ID="47" EVENT_ID="5551006">
         <action ID="5550001">
           <!--AC_SET_NEXT_BUTTON_VISIBLE-->
         </action>
       </transition>
       <transition NAME="EV_LESS_THEN_MIN_COUNT" NEXT_STATE_ID="45" EVENT_ID="5551005" />
       <transition NAME="EV_INIT" NEXT_STATE_ID="2" EVENT_ID="5551001">
         <action ID="55500010">
           <!--AC_INIT-->
         </action>
       </transition>
     </state>
     <state NAME="readyForNavigation" ID="47" X_POS="120" Y_POS="750" WIDTH="115" HEIGHT="50">
       <transition NAME="EV_NEXT" NEXT_STATE_ID="48" EVENT_ID="5551007">
         <action ID="55500018">
           <!--AC_CALCULATE_LANDMARK_TRANSFORM-->
         </action>
         <action ID="5550005">
           <!--AC_SET_ASSISTAND_WIDGET_STECK-->
           <intParameter NAME="WIDGET_ID" VALUE="4" />
         </action>
         <action ID="55500014">
           <!--AC_START_APPLICATION_TEXT-->
           <stringParameter NAME="START_APPLICATION_TEXT" VALUE="Ariadne is now ready for navigation" />
         </action>
         <action ID="5550007">
           <!--AC_SET_NEXT_BUTTON_TEXT-->
           <stringParameter NAME="BUTTON_TEXT" VALUE="Start" />
         </action>
       </transition>
       <transition NAME="EV_PREVIOUS" NEXT_STATE_ID="43" EVENT_ID="5551002">
         <action ID="5550005">
           <!--AC_SET_ASSISTAND_WIDGET_STECK-->
           <intParameter NAME="WIDGET_ID" VALUE="3" />
         </action>
         <action ID="5550002">
           <!--AC_SET_NEXT_BUTTON_INVISIBLE-->
         </action>
         <action ID="5550009">
           <!--AC_SET_DONE_FALSE-->
         </action>
       </transition>
       <transition NAME="EV_REMOVE_LANDMARK" NEXT_STATE_ID="46" EVENT_ID="5551010">
         <action ID="5550002">
           <!--AC_SET_NEXT_BUTTON_INVISIBLE-->
         </action>
         <action ID="5550007">
           <!--AC_SET_NEXT_BUTTON_TEXT-->
           <stringParameter NAME="BUTTON_TEXT" VALUE="&gt;" />
         </action>
         <action ID="5550008">
           <!--AC_CHECK_LANDMARK_COUNT-->
           <intParameter NAME="MIN_COUNT" VALUE="3" />
         </action>
       </transition>
       <transition NAME="EV_INIT" NEXT_STATE_ID="2" EVENT_ID="5551001">
         <action ID="55500010">
           <!--AC_INIT-->
         </action>
       </transition>
     </state>
     <state NAME="Navigation" ID="48" X_POS="164" Y_POS="623" WIDTH="100" HEIGHT="50">
       <transition NAME="EV_NEXT" NEXT_STATE_ID="2" EVENT_ID="5551007">
         <action ID="55500013">
           <!--AC_CLOSE_ASSISTENT-->
         </action>
         <action ID="55500011">
           <!--AC_SET_APPLICATION_SELECTED_FALSE-->
         </action>
         <action ID="5550002">
           <!--AC_SET_NEXT_BUTTON_INVISIBLE-->
         </action>
         <action ID="5550004">
           <!--AC_SET_PREVIOUS_BUTTON_INVISIBLE-->
         </action>
         <action ID="55500015">
           <!--AC_START_NAVIGATION-->
         </action>
         <action ID="5550005">
           <!--AC_SET_ASSISTAND_WIDGET_STECK-->
           <intParameter NAME="WIDGET_ID" VALUE="0" />
         </action>
         <action ID="5550007">
           <!--AC_SET_NEXT_BUTTON_TEXT-->
           <stringParameter NAME="BUTTON_TEXT" VALUE="&gt;" />
         </action>
       </transition>
       <transition NAME="EV_PREVIOUS" NEXT_STATE_ID="47" EVENT_ID="5551002">
         <action ID="5550005">
           <!--AC_SET_ASSISTAND_WIDGET_STECK-->
           <intParameter NAME="WIDGET_ID" VALUE="2" />
         </action>
         <action ID="5550007">
           <!--AC_SET_NEXT_BUTTON_TEXT-->
           <stringParameter NAME="BUTTON_TEXT" VALUE="&gt;" />
         </action>
       </transition>
       <transition NAME="EV_INIT" NEXT_STATE_ID="2" EVENT_ID="5551001">
         <action ID="55500010">
           <!--AC_INIT-->
         </action>
         <action ID="5550007">
           <!--AC_SET_NEXT_BUTTON_TEXT-->
           <stringParameter NAME="BUTTON_TEXT" VALUE="&gt;" />
         </action>
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="AffineInteractions ctrl-drag_marcus">
     <state NAME="start" ID="0" START_STATE="TRUE" X_POS="314" Y_POS="214" WIDTH="100" HEIGHT="50">
       <transition NAME="leftButtonPress" NEXT_STATE_ID="12" EVENT_ID="1">
         <!-- 30 = SeCHECKELEMENT  -->
         <action ID="30" />
       </transition>
       <transition NAME="rightButtonPress" NEXT_STATE_ID="13" EVENT_ID="2">
         <!-- 1002 = SeSCALESTART  -->
         <action ID="30" />
       </transition>
       <transition NAME="middleButtonPress" NEXT_STATE_ID="14" EVENT_ID="4">
         <!-- 1004 = SeROTATESTART  -->
         <action ID="30" />
       </transition>
     </state>
     <state NAME="picked guard Translate" ID="12" X_POS="52" Y_POS="62" WIDTH="143" HEIGHT="50">
       <transition NAME="yes" NEXT_STATE_ID="2" EVENT_ID="1004">
         <!-- EIDYES -->
         <action ID="1000" />
       </transition>
       <transition NAME="no" NEXT_STATE_ID="0" EVENT_ID="1003">
         <!-- StNO -->
         <action ID="0" />
       </transition>
     </state>
     <state NAME="picked guard Scale" ID="13" X_POS="848" Y_POS="233" WIDTH="100" HEIGHT="50">
       <transition NAME="yes" NEXT_STATE_ID="3" EVENT_ID="1004">
         <!-- EIDYES -->
         <action ID="1002" />
       </transition>
       <transition NAME="no" NEXT_STATE_ID="0" EVENT_ID="1003">
         <!-- StNO -->
         <action ID="0" />
       </transition>
     </state>
     <state NAME="picked guard Rotate" ID="14" X_POS="37" Y_POS="334" WIDTH="100" HEIGHT="50">
       <transition NAME="yes" NEXT_STATE_ID="4" EVENT_ID="1004">
         <!-- EIDYES -->
         <action ID="1004" />
       </transition>
       <transition NAME="no" NEXT_STATE_ID="0" EVENT_ID="1003">
         <!-- StNO -->
         <action ID="0" />
       </transition>
     </state>
     <state NAME="translating" ID="2" X_POS="481" Y_POS="47" WIDTH="100" HEIGHT="50">
       <transition NAME="leftButtonMove" NEXT_STATE_ID="2" EVENT_ID="530">
         <!-- 1000 = SeTRANSLATE  -->
         <action ID="1001" />
       </transition>
       <transition NAME="leftButtonRelease" NEXT_STATE_ID="0" EVENT_ID="505">
         <!-- 1000 = SeTRANSLATE  -->
         <action ID="1001" />
       </transition>
       <transition NAME="leftButtonRelease" NEXT_STATE_ID="0" EVENT_ID="537">
         <!-- CTRL+LBM_Release ==> SeTRANSLATE  -->
         <action ID="1001" />
       </transition>
     </state>
     <state NAME="scaling" ID="3" X_POS="630" Y_POS="461" WIDTH="100" HEIGHT="50">
       <transition NAME="rightButtonMove" NEXT_STATE_ID="3" EVENT_ID="531">
         <!-- 1003 = SeSCALE  -->
         <action ID="1003" />
       </transition>
       <transition NAME="rightButtonRelease" NEXT_STATE_ID="0" EVENT_ID="507">
         <!-- 1003 = SeSCALE  -->
         <action ID="1003" />
       </transition>
       <transition NAME="rightButtonRelease" NEXT_STATE_ID="0" EVENT_ID="538">
         <!-- CTRL+RBM_Release ==> SeSCALE  -->
         <action ID="1003" />
       </transition>
     </state>
     <state NAME="rotating" ID="4" X_POS="295" Y_POS="487" WIDTH="100" HEIGHT="50">
       <transition NAME="middleButtonMove" NEXT_STATE_ID="4" EVENT_ID="533">
         <!-- 1005 = SeROTATE  -->
         <action ID="1005" />
       </transition>
       <transition NAME="middleButtonRelease" NEXT_STATE_ID="0" EVENT_ID="506">
         <!-- 1005 = SeROTATE  -->
         <action ID="1005" />
       </transition>
       <transition NAME="middleButtonRelease" NEXT_STATE_ID="0" EVENT_ID="539">
         <!-- 1005 = SeROTATE  -->
         <action ID="1005" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="connectpointsinteractor">
     <!-- Behaviour for connecting points using mitk::ConnectPointsInteractor -->
     <state NAME="ready" ID="1" START_STATE="TRUE" X_POS="357" Y_POS="236" WIDTH="100" HEIGHT="50">
       <transition NAME="addPoint but check n" NEXT_STATE_ID="1" EVENT_ID="3">
         <action ID="10">
           <!--AcADDPOINT-->
         </action>
       </transition>
       <transition NAME="remove" NEXT_STATE_ID="1" EVENT_ID="12">
         <action ID="100">
           <!--AcREMOVEPOINT-->
         </action>
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="coordinate-supply">
     <state NAME="neutral" ID="1" START_STATE="TRUE" X_POS="439" Y_POS="228" WIDTH="100" HEIGHT="50">
       <transition NAME="send Koordinates release" NEXT_STATE_ID="1" EVENT_ID="505">
         <action ID="42" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="EasySegmentation">
     <state NAME="Checking for ActivateToolEvents" ID="0" START_STATE="TRUE" X_POS="193" Y_POS="206" WIDTH="174" HEIGHT="50">
       <transition NAME="OnActivateToolEvent" EVENT_ID="1300" NEXT_STATE_ID="0">
         <action ID="48009">
           <!-- AcActivateTool -->
         </action>
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="segmentation-interactor-tool:movenzoom">
     <state NAME="Ready to start" ID="0" START_STATE="TRUE">
       <transition NAME="OnLeftMouseDown" EVENT_ID="1" NEXT_STATE_ID="3" />
       <transition NAME="OnMiddleMouseDown" EVENT_ID="4" NEXT_STATE_ID="1">
         <action ID="9">
           <!-- AcInitMove -->
         </action>
       </transition>
       <transition NAME="OnRightMouseDown" EVENT_ID="2" NEXT_STATE_ID="2">
         <action ID="1011">
           <!-- AcInitZoom -->
         </action>
       </transition>
     </state>
     <state NAME="Moving" ID="1">
       <transition NAME="OnMouseMove" EVENT_ID="533" NEXT_STATE_ID="1">
         <action ID="92">
           <!-- AcMove -->
         </action>
       </transition>
       <transition NAME="OnMiddleMouseUp" EVENT_ID="506" NEXT_STATE_ID="0" />
     </state>
     <state NAME="Zooming" ID="2">
       <transition NAME="OnMouseMove" EVENT_ID="531" NEXT_STATE_ID="2">
         <action ID="1012">
           <!-- AcZoom -->
         </action>
       </transition>
       <transition NAME="OnRightMouseUp" EVENT_ID="507" NEXT_STATE_ID="0" />
     </state>
     <state NAME="Click" ID="3">
       <transition NAME="OnLeftMouseUp" EVENT_ID="505" NEXT_STATE_ID="0">
         <action ID="31">
           <!-- AcCheckObject -->
         </action>
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="segmentation-interactor-tool:needle">
     <state NAME="Ready to start" ID="0" START_STATE="TRUE">
       <transition NAME="OnMouseMove" EVENT_ID="520" NEXT_STATE_ID="0">
         <action ID="49006">
           <!-- AcUpdatePoint -->
         </action>
       </transition>
       <transition NAME="OnKeyH" EVENT_ID="22" NEXT_STATE_ID="0">
         <action ID="49004">
           <!-- AcMovePoint1 -->
         </action>
       </transition>
       <transition NAME="OnKeyT" EVENT_ID="17" NEXT_STATE_ID="0">
         <action ID="49005">
           <!-- AcMovePoint2 -->
         </action>
       </transition>
       <transition NAME="OnKeyEsc" EVENT_ID="14" NEXT_STATE_ID="7">
         <action ID="49009">
           <!-- AcDisplayOptions -->
         </action>
         <action ID="49010">
           <!-- AcCycle (cycle to first different needle) -->
         </action>
       </transition>
       <transition NAME="OnLeftMouseDown" EVENT_ID="1" NEXT_STATE_ID="3">
         <action ID="31">
           <!-- AcCheckObject -->
         </action>
       </transition>
       <transition NAME="OnMiddleMouseDown" EVENT_ID="4" NEXT_STATE_ID="1">
         <action ID="9">
           <!-- AcInitMove -->
         </action>
       </transition>
       <transition NAME="OnRightMouseDown" EVENT_ID="2" NEXT_STATE_ID="2">
         <action ID="1011">
           <!-- AcInitZoom -->
         </action>
       </transition>
       <transition NAME="OnShiftLeftMouseDown" EVENT_ID="3" NEXT_STATE_ID="0">
         <action ID="21">
           <!-- AcCheckPoint -->
         </action>
       </transition>
     </state>
     <state NAME="Moving" ID="1">
       <transition NAME="OnMouseMove" EVENT_ID="533" NEXT_STATE_ID="1">
         <action ID="92">
           <!-- AcMove -->
         </action>
       </transition>
       <transition NAME="OnMiddleMouseUp" EVENT_ID="506" NEXT_STATE_ID="0" />
     </state>
     <state NAME="Zooming" ID="2">
       <transition NAME="OnMouseMove" EVENT_ID="531" NEXT_STATE_ID="2">
         <action ID="1012">
           <!-- AcZoom -->
         </action>
       </transition>
       <transition NAME="OnRightMouseUp" EVENT_ID="507" NEXT_STATE_ID="0" />
     </state>
     <state NAME="Descision: what to drag?" ID="3">
       <transition NAME="OnTip" EVENT_ID="1050" NEXT_STATE_ID="4" />
       <transition NAME="OnHead" EVENT_ID="1051" NEXT_STATE_ID="5" />
       <transition NAME="OnBody" EVENT_ID="1052" NEXT_STATE_ID="6" />
       <transition NAME="OnNothing" EVENT_ID="1003" NEXT_STATE_ID="0" />
     </state>
     <state NAME="Tip dragging" ID="4">
       <transition NAME="OnMouseMove" EVENT_ID="530" NEXT_STATE_ID="4">
         <action ID="49002">
           <!-- AcRotateAroundHead (Point1)-->
         </action>
       </transition>
       <transition NAME="OnLeftMouseUp" EVENT_ID="505" NEXT_STATE_ID="0" />
     </state>
     <state NAME="Head dragging" ID="5">
       <transition NAME="OnMouseMove" EVENT_ID="530" NEXT_STATE_ID="5">
         <action ID="49003">
           <!-- AcRotateAroundTip (Point2)-->
         </action>
       </transition>
       <transition NAME="OnLeftMouseUp" EVENT_ID="505" NEXT_STATE_ID="0" />
     </state>
     <state NAME="Body dragging" ID="6">
       <transition NAME="OnMouseMove" EVENT_ID="530" NEXT_STATE_ID="6">
         <action ID="1001">
           <!-- AcTranslate -->
         </action>
       </transition>
       <transition NAME="OnLeftMouseUp" EVENT_ID="505" NEXT_STATE_ID="0" />
     </state>
     <state NAME="Needle choosing" ID="7">
       <transition NAME="OnKeyEsc" EVENT_ID="14" NEXT_STATE_ID="7">
         <action ID="49010">
           <!-- AcCycle -->
         </action>
       </transition>
       <transition NAME="OnKeyReturn" EVENT_ID="23" NEXT_STATE_ID="0">
         <action ID="49011">
           <!-- AcAccept -->
         </action>
       </transition>
       <transition NAME="OnKeyReturn" EVENT_ID="24" NEXT_STATE_ID="0">
         <action ID="49011">
           <!-- AcAccept -->
         </action>
       </transition>
       <transition NAME="OnKeySpace" EVENT_ID="25" NEXT_STATE_ID="0">
         <action ID="49011">
           <!-- AcAccept -->
         </action>
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="segmentation-interactor-tool:bubble">
     <state NAME="Ready to start" ID="0" START_STATE="TRUE">
       <!-- initial state: outside anything and checking for collisions -->
       <transition NAME="OnLeftMouseDown" EVENT_ID="1" NEXT_STATE_ID="2">
         <action ID="31">
           <!-- AcCheckObject -->
         </action>
       </transition>
     </state>
     <state NAME="Drawing line" ID="1">
       <!-- line drawing started, now always update the end point of the line -->
       <transition NAME="OnEscape" EVENT_ID="14" NEXT_STATE_ID="0">
         <action ID="48008">
           <!-- AcCancel -->
         </action>
       </transition>
       <transition NAME="OnMouseMove" EVENT_ID="530" NEXT_STATE_ID="1">
         <action ID="48003">
           <!-- AcUpdateLine -->
         </action>
       </transition>
       <transition NAME="OnLeftMouseUp" EVENT_ID="505" NEXT_STATE_ID="0">
         <action ID="48005">
           <!-- AcTerminateLine -->
         </action>
         <action ID="48007">
           <!-- AcCreateObjectFromLine -->
         </action>
         <action ID="48008">
           <!-- AcCancel -->
         </action>
       </transition>
     </state>
     <state NAME="Decide between creating and modifying. modify?" ID="2">
       <transition NAME="OnNo" EVENT_ID="1003" NEXT_STATE_ID="1">
         <action ID="48004">
           <!-- AcInitLine -->
         </action>
       </transition>
       <transition NAME="OnYes" EVENT_ID="1004" NEXT_STATE_ID="6" />
     </state>
     <state NAME="Decide between left and right movement. Left?" ID="5">
       <transition NAME="OnNo" EVENT_ID="1003" NEXT_STATE_ID="6">
         <action ID="49012">
           <!-- AcIncrease -->
         </action>
       </transition>
       <transition NAME="OnYes" EVENT_ID="1004" NEXT_STATE_ID="6">
         <action ID="49013">
           <!-- AcDecrease -->
         </action>
       </transition>
     </state>
     <state NAME="Decide between left and right movement. Left?" ID="6">
       <transition NAME="OnMouseMove" EVENT_ID="530" NEXT_STATE_ID="5">
         <action ID="8">
           <!-- AcInitMovement -->
         </action>
       </transition>
       <transition NAME="OnMouseUp" EVENT_ID="505" NEXT_STATE_ID="0" />
     </state>
   </stateMachine>
   <stateMachine NAME="pointinteractor">
     <state NAME="unselected" ID="0" START_STATE="TRUE" X_POS="17" Y_POS="23" WIDTH="100" HEIGHT="50">
       <transition NAME="addPoint" NEXT_STATE_ID="1" EVENT_ID="3">
         <action ID="1101">
           <!--AcMODESELECT-->
         </action>
         <action ID="10">
           <!--AcADDPOINT-->
         </action>
         <action ID="30">
           <!--AcCHECKELEMENT-->
           <intParameter NAME="precision" VALUE="4" />
         </action>
       </transition>
       <transition NAME="checkpicked" NEXT_STATE_ID="2" EVENT_ID="1">
         <action ID="30">
           <!--AcCHECKELEMENT-->
           <intParameter NAME="precision" VALUE="4" />
         </action>
       </transition>
     </state>
     <state NAME="selected" ID="1" X_POS="663" Y_POS="89" WIDTH="100" HEIGHT="50">
       <transition NAME="deselect all and add point" NEXT_STATE_ID="1" EVENT_ID="3">
         <action ID="72">
           <!--AcDESELECTALL-->
         </action>
         <action ID="10">
           <!--AcADDPOINT-->
         </action>
         <action ID="30">
           <!--AcCHECKELEMENT-->
           <intParameter NAME="precision" VALUE="4" />
         </action>
       </transition>
       <transition NAME="remove" NEXT_STATE_ID="5" EVENT_ID="12">
         <action ID="1500">
           <!--AcCHECKGREATERONE-->
         </action>
       </transition>
       <transition NAME="checkSamePick" NEXT_STATE_ID="3" EVENT_ID="1">
         <action ID="34">
           <!--AcCHECKSELECTED-->
           <intParameter NAME="precision" VALUE="4" />
         </action>
       </transition>
       <transition NAME="deselect all" NEXT_STATE_ID="0" EVENT_ID="2000">
         <action ID="72">
           <!--AcDESELECTALL-->
         </action>
         <action ID="1100">
           <!--AcMODEDESELECT-->
         </action>
       </transition>
     </state>
     <state NAME="checkpicked" ID="2" X_POS="385" Y_POS="221" WIDTH="100" HEIGHT="50">
       <transition NAME="EIDNo" NEXT_STATE_ID="0" EVENT_ID="1003" />
       <transition NAME="EIDYes" NEXT_STATE_ID="1" EVENT_ID="1004">
         <action ID="1101">
           <!--AcMODESELECT-->
         </action>
         <action ID="65">
           <!--AcSELECT-->
         </action>
       </transition>
     </state>
     <state NAME="checkStillPicked" ID="3" X_POS="417" Y_POS="497" WIDTH="100" HEIGHT="50">
       <transition NAME="EIDNo" NEXT_STATE_ID="0" EVENT_ID="1003">
         <action ID="72">
           <!--AcDESELECTALL-->
         </action>
         <action ID="1100">
           <!--AcMODEDESELECT-->
         </action>
       </transition>
       <transition NAME="EIDYes" NEXT_STATE_ID="4" EVENT_ID="1004">
         <action ID="8">
           <!--AcINITMOVEMENT-->
         </action>
       </transition>
     </state>
     <state NAME="moves" ID="4" X_POS="799" Y_POS="483" WIDTH="100" HEIGHT="50">
       <transition NAME="mousemove" NEXT_STATE_ID="4" EVENT_ID="530">
         <action ID="91">
           <!--AcMOVESELECTED-->
         </action>
       </transition>
       <transition NAME="finishmove" NEXT_STATE_ID="1" EVENT_ID="505">
         <action ID="42">
           <!--AcFINISHMOVEMENT-->
         </action>
       </transition>
     </state>
     <state NAME="checkGreaterOne" ID="5" X_POS="416" Y_POS="344" WIDTH="100" HEIGHT="50">
       <transition NAME="StYes" NEXT_STATE_ID="1" EVENT_ID="1004">
         <action ID="100">
           <!--AcREMOVEPOINT-->
         </action>
         <action ID="61">
           <!--AcSELECTANOTHEROBJECT-->
         </action>
       </transition>
       <transition NAME="StNo" NEXT_STATE_ID="0" EVENT_ID="1003">
         <action ID="100">
           <!--AcREMOVEPOINT-->
         </action>
         <action ID="1100">
           <!--AcMODEDESELECT-->
         </action>
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="pointselectorinteractor">
     <state NAME="unselected" ID="0" START_STATE="TRUE" X_POS="17" Y_POS="23" WIDTH="100" HEIGHT="50">
       <transition NAME="addPoint" NEXT_STATE_ID="1" EVENT_ID="3">
         <action ID="1101">
           <!--AcMODESELECT-->
         </action>
         <action ID="10">
           <!--AcADDPOINT-->
         </action>
         <action ID="30">
           <!--AcCHECKELEMENT-->
           <intParameter NAME="precision" VALUE="4" />
         </action>
       </transition>
       <transition NAME="checkpicked" NEXT_STATE_ID="2" EVENT_ID="1">
         <action ID="30">
           <!--AcCHECKELEMENT-->
           <intParameter NAME="precision" VALUE="4" />
         </action>
       </transition>
     </state>
     <state NAME="selected" ID="1" X_POS="663" Y_POS="89" WIDTH="100" HEIGHT="50">
       <transition NAME="deselect all and add point" NEXT_STATE_ID="1" EVENT_ID="3">
         <action ID="72">
           <!--AcDESELECTALL-->
         </action>
         <action ID="10">
           <!--AcADDPOINT-->
         </action>
         <action ID="30">
           <!--AcCHECKELEMENT-->
           <intParameter NAME="precision" VALUE="4" />
         </action>
       </transition>
       <transition NAME="remove" NEXT_STATE_ID="5" EVENT_ID="12">
         <action ID="1500">
           <!--AcCHECKGREATERONE-->
         </action>
       </transition>
       <transition NAME="checkSamePick" NEXT_STATE_ID="3" EVENT_ID="1">
         <action ID="34">
           <!--AcCHECKSELECTED-->
           <intParameter NAME="precision" VALUE="4" />
         </action>
       </transition>
       <transition NAME="deselect all" NEXT_STATE_ID="0" EVENT_ID="2000">
         <action ID="72">
           <!--AcDESELECTALL-->
         </action>
         <action ID="1100">
           <!--AcMODEDESELECT-->
         </action>
       </transition>
     </state>
     <state NAME="checkpicked" ID="2" X_POS="385" Y_POS="221" WIDTH="100" HEIGHT="50">
       <transition NAME="EIDNo" NEXT_STATE_ID="0" EVENT_ID="1003" />
       <transition NAME="EIDYes" NEXT_STATE_ID="1" EVENT_ID="1004">
         <action ID="1101">
           <!--AcMODESELECT-->
         </action>
         <action ID="65">
           <!--AcSELECT-->
         </action>
       </transition>
     </state>
     <state NAME="checkStillPicked" ID="3" X_POS="417" Y_POS="497" WIDTH="100" HEIGHT="50">
       <transition NAME="EIDNo" NEXT_STATE_ID="0" EVENT_ID="1003">
         <action ID="72">
           <!--AcDESELECTALL-->
         </action>
         <action ID="1100">
           <!--AcMODEDESELECT-->
         </action>
       </transition>
       <transition NAME="EIDYes" NEXT_STATE_ID="4" EVENT_ID="1004">
         <action ID="8">
           <!--AcINITMOVEMENT-->
         </action>
       </transition>
     </state>
     <state NAME="moves" ID="4" X_POS="799" Y_POS="483" WIDTH="100" HEIGHT="50">
       <transition NAME="mousemove" NEXT_STATE_ID="4" EVENT_ID="530">
         <action ID="91">
           <!--AcMOVESELECTED-->
         </action>
       </transition>
       <transition NAME="finishmove" NEXT_STATE_ID="1" EVENT_ID="505">
         <action ID="42">
           <!--AcFINISHMOVEMENT-->
         </action>
       </transition>
     </state>
     <state NAME="checkGreaterOne" ID="5" X_POS="416" Y_POS="344" WIDTH="100" HEIGHT="50">
       <transition NAME="StYes" NEXT_STATE_ID="1" EVENT_ID="1004">
         <action ID="100">
           <!--AcREMOVEPOINT-->
         </action>
         <action ID="61">
           <!--AcSELECTANOTHEROBJECT-->
         </action>
       </transition>
       <transition NAME="StNo" NEXT_STATE_ID="0" EVENT_ID="1003">
         <action ID="100">
           <!--AcREMOVEPOINT-->
         </action>
         <action ID="1100">
           <!--AcMODEDESELECT-->
         </action>
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="pointsetinteractor">
     <!-- Behaviour of a set of Points. a defined number of points can be set/removed/selected/deselectd/moved -->
     <state NAME="no points or loaded points" ID="1" START_STATE="TRUE" X_POS="1066" Y_POS="281" WIDTH="100" HEIGHT="50">
       <transition NAME="0SmallerPointsLoadedSmallerN" NEXT_STATE_ID="2" EVENT_ID="1014" />
       <!-- If points have been loaded, goto right state; checked in constructor -->
       <transition NAME="PointsLoadedGreaterEqualsN" NEXT_STATE_ID="4" EVENT_ID="1015" />
       <!-- If points have been loaded, goto right state; checked in constructor -->
       <transition NAME="addPoint but check n" NEXT_STATE_ID="3" EVENT_ID="3">
         <action ID="1101" />
         <!--AcMODE_SELECT-->
         <action ID="32" />
       </transition>
       <transition NAME="checkn Delete" NEXT_STATE_ID="30" EVENT_ID="12">
         <action ID="330" />
         <!--AcCHECKNUMBEROFPOINTS-->
       </transition>
       <transition NAME="SetThisStatemachineOnSelected" NEXT_STATE_ID="1" EVENT_ID="1030">
         <action ID="1101" />
         <!--AcMODE_SELECT-->
       </transition>
       <transition NAME="SetThisStatemachineOnDeselected" NEXT_STATE_ID="1" EVENT_ID="1031">
         <action ID="1100" />
         <!--AcMODE_DESELECT-->
       </transition>
     </state>
     <state NAME="space left" ID="2" X_POS="659" Y_POS="257" WIDTH="100" HEIGHT="50">
       <transition NAME="addPoint but check n" NEXT_STATE_ID="3" EVENT_ID="3">
         <action ID="32" />
       </transition>
       <transition NAME="Select or move point Space" NEXT_STATE_ID="10" EVENT_ID="1">
         <action ID="30" />
       </transition>
       <transition NAME="check selected and Delete" NEXT_STATE_ID="31" EVENT_ID="12">
         <action ID="340" />
         <!--AcCHECKONESELECTED-->
       </transition>
       <transition NAME="DeselectAll" NEXT_STATE_ID="2" EVENT_ID="14">
         <!--Event = ESC-->
         <action ID="72" />
         <!--AcDESELECTALL-->
         <action ID="1100" />
         <!--AcMODE_DESELECT-->
       </transition>
     </state>
     <state NAME="checkedN" ID="3" X_POS="745" Y_POS="744" WIDTH="100" HEIGHT="50">
       <transition NAME="n smaller N" NEXT_STATE_ID="40" EVENT_ID="1010">
         <action ID="37" />
       </transition>
       <transition NAME="n greater equals N" NEXT_STATE_ID="41" EVENT_ID="1011">
         <action ID="37" />
       </transition>
     </state>
     <state NAME="set full" ID="4" X_POS="267" Y_POS="633" WIDTH="100" HEIGHT="50">
       <transition NAME="Select or move point FULL" NEXT_STATE_ID="20" EVENT_ID="1">
         <action ID="30" />
         <!--AcCHECKELEMENT-->
       </transition>
       <transition NAME="checkn Delete selected Point" NEXT_STATE_ID="30" EVENT_ID="12">
         <action ID="330" />
         <!--AcCHECKNUMBEROFPOINTS-->
       </transition>
       <transition NAME="DeselectAll" NEXT_STATE_ID="2" EVENT_ID="14">
         <!--Event = ESC-->
         <action ID="72" />
         <!--AcDESELECTALL-->
         <action ID="1100" />
         <!--AcMODEDESELECT-->
       </transition>
     </state>
     <state NAME="picked NotFull" ID="10" X_POS="903" Y_POS="38" WIDTH="100" HEIGHT="50">
       <transition NAME="StNo" NEXT_STATE_ID="2" EVENT_ID="1003">
         <action ID="72" />
         <!--AcDESELECTALL-->
         <action ID="1100" />
         <!--AcMODEDESELECT-->
       </transition>
       <transition NAME="StYes" NEXT_STATE_ID="11" EVENT_ID="1004">
         <action ID="34" />
         <!--AcCHECKSELECTED-->
         <action ID="1101" />
         <!--AcMODESELECT-->
       </transition>
     </state>
     <state NAME="already selected Space" ID="11" X_POS="391" Y_POS="11" WIDTH="100" HEIGHT="50">
       <transition NAME="StNo" NEXT_STATE_ID="2" EVENT_ID="1003">
         <action ID="60" />
       </transition>
       <transition NAME="StYes" NEXT_STATE_ID="12" EVENT_ID="1004">
         <action ID="8" />
       </transition>
     </state>
     <state NAME="move Point Space" ID="12" X_POS="100" Y_POS="99" WIDTH="100" HEIGHT="50">
       <transition NAME="move point" NEXT_STATE_ID="12" EVENT_ID="530">
         <action ID="91" />
       </transition>
       <transition NAME="finish move" NEXT_STATE_ID="2" EVENT_ID="505">
         <action ID="42" />
       </transition>
       <transition NAME="Safety init" NEXT_STATE_ID="12" EVENT_ID="1">
         <action ID="8" />
       </transition>
     </state>
     <state NAME="picked Full" ID="20" X_POS="122" Y_POS="766" WIDTH="100" HEIGHT="50">
       <transition NAME="StNO" NEXT_STATE_ID="4" EVENT_ID="1003">
         <action ID="72" />
         <!--AcDESELECTALL-->
         <action ID="1100" />
         <!--AcMODEDESELECT-->
       </transition>
       <transition NAME="StYES" NEXT_STATE_ID="21" EVENT_ID="1004">
         <action ID="34" />
         <!--AcCHECKSELECTED-->
         <action ID="1101" />
         <!--AcMODESELECT-->
       </transition>
     </state>
     <state NAME="selected Full" ID="21" X_POS="23" Y_POS="485" WIDTH="100" HEIGHT="50">
       <transition NAME="StNo" NEXT_STATE_ID="4" EVENT_ID="1003">
         <action ID="60" />
         <!--AcSELECTPICKEDOBJECT-->
       </transition>
       <transition NAME="StYes" NEXT_STATE_ID="22" EVENT_ID="1004">
         <action ID="8" />
         <!--AcINITMOVEMENT-->
       </transition>
     </state>
     <state NAME="move Point Full" ID="22" X_POS="67" Y_POS="255" WIDTH="100" HEIGHT="50">
       <!--  since the MouseMove Event is send by QT we don't have the information about the position of the point in the list. we had it before, when we checked, if it was picked, or if it was selected -->
       <transition NAME="move point" NEXT_STATE_ID="22" EVENT_ID="530">
         <action ID="91" />
       </transition>
       <transition NAME="finish move" NEXT_STATE_ID="4" EVENT_ID="505">
         <action ID="42" />
       </transition>
       <transition NAME="Safety init" NEXT_STATE_ID="22" EVENT_ID="1">
         <action ID="8" />
       </transition>
     </state>
     <state NAME="checkn Delete" ID="30" X_POS="1124" Y_POS="708" WIDTH="100" HEIGHT="50">
       <transition NAME="StillFull" NEXT_STATE_ID="4" EVENT_ID="1015">
         <action ID="100" />
         <!--AcREMOVEPOINT-->
       </transition>
       <transition NAME="NotEmptyNotFull" NEXT_STATE_ID="2" EVENT_ID="1014">
         <action ID="100" />
         <!--AcREMOVEPOINT-->
       </transition>
       <transition NAME="WillBeEmpty" NEXT_STATE_ID="1" EVENT_ID="1017">
         <action ID="100" />
         <!--AcREMOVEPOINT-->
         <action ID="1100" />
         <!--AcMODEDESELECT-->
       </transition>
     </state>
     <state NAME="selected space left" ID="31" X_POS="22" Y_POS="480" WIDTH="90" HEIGHT="50">
       <transition NAME="StNo" NEXT_STATE_ID="2" EVENT_ID="1003" />
       <transition NAME="StYes" NEXT_STATE_ID="30" EVENT_ID="1004">
         <action ID="330" />
         <!--AcCHECKNUMBEROFPOINTS-->
       </transition>
     </state>
     <state NAME="checkedPositionEventSmallerN" ID="40" X_POS="267" Y_POS="301" WIDTH="173" HEIGHT="50">
       <transition NAME="PositionEvent" NEXT_STATE_ID="2" EVENT_ID="1004">
         <action ID="10" />
         <!--AcADDPOINT-->
         <action ID="1100" />
         <!--AcMODE_DESELECT-->
       </transition>
       <transition NAME="others" NEXT_STATE_ID="2" EVENT_ID="1003">
         <action ID="1100" />
         <!--AcMODE_DESELECT-->
       </transition>
     </state>
     <state NAME="checkedPositionEventGreaterN" ID="41" X_POS="562" Y_POS="424" WIDTH="168" HEIGHT="50">
       <transition NAME="PositionEvent" NEXT_STATE_ID="4" EVENT_ID="1004">
         <action ID="10" />
         <!--AcADDPOINT-->
         <action ID="1100" />
         <!--AcMODE_DESELECT-->
       </transition>
       <transition NAME="others" NEXT_STATE_ID="2" EVENT_ID="1003">
         <action ID="1100" />
         <!--AcMODE_DESELECT-->
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="onlymovepointsetinteractor">
     <!-- Behaviour of a set of Points. The points can only be selected and moved.-->
     <state NAME="no points or loaded points" ID="1" START_STATE="TRUE" X_POS="1066" Y_POS="281" WIDTH="100" HEIGHT="50">
       <transition NAME="0SmallerPointsLoadedSmallerN" NEXT_STATE_ID="2" EVENT_ID="1014" />
       <!-- If points have been loaded, goto right state; checked in constructor -->
       <transition NAME="PointsLoadedGreaterEqualsN" NEXT_STATE_ID="2" EVENT_ID="1015" />
       <!-- If points have been loaded, goto right state; checked in constructor -->
       <transition NAME="SetThisStatemachineOnSelected" NEXT_STATE_ID="1" EVENT_ID="1030">
         <action ID="1101">
           <!--AcMODE_SELECT-->
         </action>
       </transition>
       <transition NAME="SetThisStatemachineOnDeselected" NEXT_STATE_ID="1" EVENT_ID="1031">
         <action ID="1100">
           <!--AcMODE_DESELECT-->
         </action>
       </transition>
     </state>
     <state NAME="loaded points" ID="2" X_POS="659" Y_POS="257" WIDTH="100" HEIGHT="50">
       <transition NAME="Select or move point" NEXT_STATE_ID="10" EVENT_ID="1">
         <action ID="30" />
       </transition>
       <transition NAME="DeselectAll" NEXT_STATE_ID="2" EVENT_ID="14">
         <!--Event = ESC-->
         <action ID="72">
           <!--AcDESELECTALL-->
         </action>
         <action ID="1100">
           <!--AcMODE_DESELECT-->
         </action>
       </transition>
     </state>
     <state NAME="picked point" ID="10" X_POS="903" Y_POS="38" WIDTH="100" HEIGHT="50">
       <transition NAME="StNo" NEXT_STATE_ID="2" EVENT_ID="1003">
         <action ID="72">
           <!--AcDESELECTALL-->
         </action>
         <action ID="1100">
           <!--AcMODEDESELECT-->
         </action>
       </transition>
       <transition NAME="StYes" NEXT_STATE_ID="11" EVENT_ID="1004">
         <action ID="34">
           <!--AcCHECKSELECTED-->
         </action>
         <action ID="1101">
           <!--AcMODESELECT-->
         </action>
       </transition>
     </state>
     <state NAME="already selected point" ID="11" X_POS="391" Y_POS="11" WIDTH="100" HEIGHT="50">
       <transition NAME="StNo" NEXT_STATE_ID="2" EVENT_ID="1003">
         <action ID="60" />
       </transition>
       <transition NAME="StYes" NEXT_STATE_ID="12" EVENT_ID="1004">
         <action ID="8" />
       </transition>
     </state>
     <state NAME="move point" ID="12" X_POS="100" Y_POS="99" WIDTH="100" HEIGHT="50">
       <transition NAME="move point" NEXT_STATE_ID="12" EVENT_ID="530">
         <action ID="91" />
       </transition>
       <transition NAME="finish move" NEXT_STATE_ID="2" EVENT_ID="505">
         <action ID="42" />
       </transition>
       <transition NAME="Safety init" NEXT_STATE_ID="12" EVENT_ID="1">
         <action ID="8" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="seedpointsetinteractor">
     <!-- Behaviour of one Point. Point is added by clicking left Mouse Button and holding Shift-->
     <state NAME="no point" ID="1" START_STATE="TRUE" X_POS="59" Y_POS="45" WIDTH="169" HEIGHT="50">
       <transition NAME="0SmallerPointsLoadedSmallerN" NEXT_STATE_ID="10" EVENT_ID="1014" />
       <!-- If point has been loaded, goto right state; checked in constructor -->
       <transition NAME="PointsLoadedGreaterEqualsN" NEXT_STATE_ID="10" EVENT_ID="1015" />
       <!-- If point has been loaded, goto right state; checked in constructor -->
       <transition NAME="addPoint" NEXT_STATE_ID="2" EVENT_ID="3">
         <action ID="1101">
           <!--AcMODESELECT-->
         </action>
         <action ID="37" />
         <!--AcCHECKOPERATION-->
       </transition>
     </state>
     <state NAME="checkPositionEvent" ID="2" X_POS="164" Y_POS="334" WIDTH="166" HEIGHT="50">
       <transition NAME="PositionEvent" NEXT_STATE_ID="10" EVENT_ID="1004">
         <action ID="10" />
         <!--AcADDPOINT-->
       </transition>
       <transition NAME="others" NEXT_STATE_ID="1" EVENT_ID="1003">
         <action ID="0" />
       </transition>
     </state>
     <state NAME="point" ID="10" X_POS="914" Y_POS="734" WIDTH="100" HEIGHT="50">
       <transition NAME="insertPoint" NEXT_STATE_ID="11" EVENT_ID="3">
         <action ID="37" />
         <!--AcCHECKOPERATION-->
       </transition>
       <transition NAME="Select or move point" NEXT_STATE_ID="12" EVENT_ID="1">
         <action ID="30" />
         <!--AcCHECKELEMENT-->
       </transition>
       <transition NAME="check selected and delete" NEXT_STATE_ID="15" EVENT_ID="12">
         <action ID="340" />
         <!--AcCHECKONESELECTED-->
       </transition>
     </state>
     <state NAME="checkedPositionEventPoint" ID="11" X_POS="758" Y_POS="478" WIDTH="100" HEIGHT="50">
       <transition NAME="PositionEvent" NEXT_STATE_ID="10" EVENT_ID="1004">
         <action ID="103" />
         <!--AcREMOVEALL-->
         <action ID="10" />
         <!--AcADDPOINT-->
       </transition>
       <transition NAME="others" NEXT_STATE_ID="10" EVENT_ID="1003">
         <action ID="0" />
       </transition>
     </state>
     <state NAME="picked point" ID="12" X_POS="23" Y_POS="560" WIDTH="150" HEIGHT="50">
       <transition NAME="StNo" NEXT_STATE_ID="10" EVENT_ID="1003">
         <action ID="72" />
         <!--AcDESELECTALL-->
         <action ID="1100" />
         <!--AcMODEDESELECT-->
       </transition>
       <transition NAME="StYes" NEXT_STATE_ID="13" EVENT_ID="1004">
         <action ID="34" />
         <!--AcCHECKSELECTED-->
         <action ID="1101" />
         <!--AcMODESELECT-->
       </transition>
     </state>
     <state NAME="selected" ID="13" X_POS="23" Y_POS="485" WIDTH="100" HEIGHT="50">
       <transition NAME="StNo" NEXT_STATE_ID="10" EVENT_ID="1003">
         <action ID="60" />
         <!--AcSELECTPICKEDOBJECT-->
       </transition>
       <transition NAME="StYes" NEXT_STATE_ID="14" EVENT_ID="1004">
         <action ID="8" />
         <!--AcINITMOVEMENT-->
       </transition>
     </state>
     <state NAME="move Point" ID="14" X_POS="76" Y_POS="731" WIDTH="100" HEIGHT="50">
       <transition NAME="move point" NEXT_STATE_ID="14" EVENT_ID="530">
         <action ID="91" />
         <!--AcMOVESELECTED-->
       </transition>
       <transition NAME="finish move" NEXT_STATE_ID="10" EVENT_ID="505">
         <action ID="42" />
         <!--AcFINISHMOVEMENT-->
       </transition>
       <transition NAME="Safety init" NEXT_STATE_ID="14" EVENT_ID="1">
         <action ID="8" />
         <!--AcINITMOVEMENT-->
       </transition>
     </state>
     <state NAME="already selected" ID="15" X_POS="23" Y_POS="560" WIDTH="150" HEIGHT="50">
       <transition NAME="StNo" NEXT_STATE_ID="10" EVENT_ID="1003" />
       <transition NAME="StYes" NEXT_STATE_ID="16" EVENT_ID="1004">
         <action ID="33" />
         <!--AcCHECKEQUALS1-->
       </transition>
     </state>
     <state NAME="delete" ID="16" X_POS="1151" Y_POS="19" WIDTH="100" HEIGHT="50">
       <transition NAME="equalsOne" NEXT_STATE_ID="1" EVENT_ID="1004">
         <action ID="100" />
         <!--AcREMOVEPOINT-->
         <action ID="1100" />
         <!--AcMODEDESELECT-->
       </transition>
       <transition NAME="largerOne" NEXT_STATE_ID="10" EVENT_ID="1003">
         <action ID="100" />
         <!--AcREMOVEPOINT-->
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="VesselGraphInteractor">
     <state NAME="Start" ID="1" START_STATE="TRUE" X_POS="1390" Y_POS="-1" WIDTH="100" HEIGHT="50">
       <transition NAME="goToCheckPicking" NEXT_STATE_ID="2" EVENT_ID="5">
         <action ID="31">
           <!--AcCHECKOBJECT-->
         </action>
       </transition>
       <transition NAME="goToCheckPicking" NEXT_STATE_ID="2" EVENT_ID="8">
         <action ID="31">
           <!--AcCHECKOBJECT-->
         </action>
       </transition>
     </state>
     <state NAME="CheckPicking" ID="2" X_POS="515" Y_POS="263" WIDTH="100" HEIGHT="50">
       <transition NAME="noPicked" NEXT_STATE_ID="4" EVENT_ID="1003">
         <action ID="66">
           <!-- AcSELECTPOINT  -->
         </action>
       </transition>
       <transition NAME="yesPicked" NEXT_STATE_ID="3" EVENT_ID="1004">
         <action ID="69">
           <!-- AcSELECTSUBOBJECT  -->
         </action>
       </transition>
     </state>
     <state NAME="OneVesselPicked" ID="3" X_POS="1488" Y_POS="350" WIDTH="100" HEIGHT="50">
       <transition NAME="goToCheckPicking" NEXT_STATE_ID="5" EVENT_ID="5">
         <action ID="31">
           <!-- AcCHECKOBJECT  -->
         </action>
       </transition>
       <transition NAME="goToCheckPicking" NEXT_STATE_ID="5" EVENT_ID="8">
         <action ID="31">
           <!-- AcCHECKOBJECT  -->
         </action>
       </transition>
       <transition NAME="delete" NEXT_STATE_ID="1" EVENT_ID="12">
         <action ID="104">
           <!-- AcREMOVESELECTEDSUBOBJECT -->
         </action>
       </transition>
       <transition NAME="deselectAll" NEXT_STATE_ID="1" EVENT_ID="14">
         <action ID="72">
           <!-- AcDESELECTALL -->
         </action>
       </transition>
       <transition NAME="searchPeriphery" NEXT_STATE_ID="11" EVENT_ID="15">
         <action ID="3000">
           <!-- AcPERIPHERYSEARCH -->
         </action>
       </transition>
       <transition NAME="searchToRoot" NEXT_STATE_ID="11" EVENT_ID="16">
         <action ID="3001">
           <!-- AcROOTSEARCH -->
         </action>
       </transition>
       <transition NAME="searchToThickstVessel" NEXT_STATE_ID="11" EVENT_ID="17">
         <action ID="3002">
           <!-- AcTHICKSTVESSELSEARCH -->
         </action>
       </transition>
       <!--now follow the attibutations for different vessel types-->
       <transition NAME="attributation" NEXT_STATE_ID="3" EVENT_ID="20">
         <action ID="3005">
           <!-- AcATTRIBUTATION -->
           <intParameter NAME="attribute_id" VALUE="0" />
         </action>
       </transition>
       <transition NAME="attributation" NEXT_STATE_ID="3" EVENT_ID="21">
         <action ID="3005">
           <!-- AcATTRIBUTATION -->
           <intParameter NAME="attribute_id" VALUE="1" />
         </action>
       </transition>
       <transition NAME="attributation" NEXT_STATE_ID="3" EVENT_ID="30">
         <action ID="3005">
           <!-- AcATTRIBUTATION -->
           <intParameter NAME="attribute_id" VALUE="2" />
         </action>
       </transition>
       <transition NAME="attributation" NEXT_STATE_ID="3" EVENT_ID="31">
         <action ID="3005">
           <!-- AcATTRIBUTATION -->
           <intParameter NAME="attribute_id" VALUE="3" />
         </action>
       </transition>
       <transition NAME="attributation" NEXT_STATE_ID="3" EVENT_ID="40">
         <action ID="3005">
           <!-- AcATTRIBUTATION -->
           <intParameter NAME="attribute_id" VALUE="4" />
         </action>
       </transition>
       <transition NAME="default" NEXT_STATE_ID="1" EVENT_ID="90">
         <action ID="3007">
           <!-- AcDEFAULT -->
         </action>
       </transition>
     </state>
     <state NAME="OnePointPicked" ID="4" X_POS="339" Y_POS="103" WIDTH="100" HEIGHT="50">
       <transition NAME="goToCheckPicking" NEXT_STATE_ID="6" EVENT_ID="5">
         <action ID="31">
           <!-- AcCHECKOBJECT  -->
         </action>
       </transition>
       <transition NAME="goToCheckPicking" NEXT_STATE_ID="6" EVENT_ID="8">
         <action ID="31">
           <!-- AcCHECKOBJECT  -->
         </action>
       </transition>
       <transition NAME="deselectAll" NEXT_STATE_ID="1" EVENT_ID="14">
         <action ID="72">
           <!-- AcDESELECTALL -->
         </action>
       </transition>
     </state>
     <state NAME="CheckPicking" ID="5" X_POS="43" Y_POS="721" WIDTH="100" HEIGHT="50">
       <transition NAME="noPicked" NEXT_STATE_ID="7" EVENT_ID="1003">
         <action ID="66">
           <!-- AcSELECTPOINT  -->
         </action>
       </transition>
       <transition NAME="yesPicked" NEXT_STATE_ID="13" EVENT_ID="1004">
         <action ID="69">
           <!-- AcSELECTSUBOBJECT  -->
         </action>
         <action ID="3010">
           <!-- AcCHECKBARRIERSTATUS -->
         </action>
       </transition>
     </state>
     <state NAME="CheckPicking" ID="6" X_POS="552" Y_POS="156" WIDTH="100" HEIGHT="50">
       <transition NAME="noPicked" NEXT_STATE_ID="9" EVENT_ID="1003">
         <action ID="66">
           <!-- AcSELECTPOINT  -->
         </action>
       </transition>
       <transition NAME="yesPicked" NEXT_STATE_ID="7" EVENT_ID="1004">
         <action ID="69">
           <!-- AcSELECTSUBOBJECT  -->
         </action>
       </transition>
     </state>
     <state NAME="OneVesselOnePointPicked" ID="7" X_POS="665" Y_POS="378" WIDTH="151" HEIGHT="50">
       <transition NAME="ENew" NEXT_STATE_ID="1" EVENT_ID="13">
         <action ID="81">
           <!-- AcNEWSUBOBJECT -->
         </action>
         <action ID="72">
           <!-- AcDESELECTALL -->
         </action>
       </transition>
       <transition NAME="deselectAll" NEXT_STATE_ID="1" EVENT_ID="14">
         <action ID="72">
           <!-- AcDESELECTALL -->
         </action>
       </transition>
       <transition NAME="delete" NEXT_STATE_ID="1" EVENT_ID="12">
         <action ID="104">
           <!-- AcREMOVESELECTEDSUBOBJECT -->
         </action>
       </transition>
       <transition NAME="setVesselElement" NEXT_STATE_ID="7" EVENT_ID="91">
         <action ID="3008">
           <!-- AcSETVESSELELEMENT-->
         </action>
       </transition>
       <!--now follow the attibutations for different vessel types-->
       <transition NAME="attributation" NEXT_STATE_ID="7" EVENT_ID="20">
         <action ID="3005">
           <!-- AcATTRIBUTATION -->
           <intParameter NAME="attribute_id" VALUE="0" />
         </action>
       </transition>
       <transition NAME="attributation" NEXT_STATE_ID="7" EVENT_ID="21">
         <action ID="3005">
           <!-- AcATTRIBUTATION -->
           <intParameter NAME="attribute_id" VALUE="1" />
         </action>
       </transition>
       <transition NAME="attributation" NEXT_STATE_ID="7" EVENT_ID="30">
         <action ID="3005">
           <!-- AcATTRIBUTATION -->
           <intParameter NAME="attribute_id" VALUE="2" />
         </action>
       </transition>
       <transition NAME="attributation" NEXT_STATE_ID="7" EVENT_ID="31">
         <action ID="3005">
           <!-- AcATTRIBUTATION -->
           <intParameter NAME="attribute_id" VALUE="3" />
         </action>
       </transition>
       <transition NAME="attributation" NEXT_STATE_ID="7" EVENT_ID="40">
         <action ID="3005">
           <!-- AcATTRIBUTATION -->
           <intParameter NAME="attribute_id" VALUE="4" />
         </action>
       </transition>
       <transition NAME="default" NEXT_STATE_ID="1" EVENT_ID="90">
         <action ID="3007">
           <!-- AcDEFAULT -->
         </action>
       </transition>
     </state>
     <state NAME="TwoVesselsPicked" ID="8" X_POS="77" Y_POS="79" WIDTH="100" HEIGHT="50">
       <transition NAME="ENew" NEXT_STATE_ID="1" EVENT_ID="13">
         <action ID="81">
           <!-- AcNEWSUBOBJECT -->
         </action>
         <action ID="72">
           <!-- AcDESELECTALL -->
         </action>
       </transition>
       <transition NAME="goToCheckPicking" NEXT_STATE_ID="10" EVENT_ID="5">
         <action ID="31">
           <!-- AcCHECKOBJECT  -->
         </action>
       </transition>
       <transition NAME="goToCheckPicking" NEXT_STATE_ID="10" EVENT_ID="8">
         <action ID="31">
           <!-- AcCHECKOBJECT  -->
         </action>
       </transition>
       <transition NAME="searchShortestPathBetween2Edges" NEXT_STATE_ID="11" EVENT_ID="18">
         <action ID="3003">
           <!-- AcSHORTESTPATHSEARCH -->
         </action>
       </transition>
       <transition NAME="deselectAll" NEXT_STATE_ID="1" EVENT_ID="14">
         <action ID="72">
           <!-- AcDESELECTALL -->
         </action>
       </transition>
       <transition NAME="delete" NEXT_STATE_ID="1" EVENT_ID="12">
         <action ID="104">
           <!-- AcREMOVESELECTEDSUBOBJECT -->
         </action>
       </transition>
       <transition NAME="setVesselElement" NEXT_STATE_ID="8" EVENT_ID="91">
         <action ID="3008">
           <!-- AcSETVESSELELEMENT-->
         </action>
       </transition>
       <!--now follow the attibutations for different vessel types-->
       <transition NAME="attributation" NEXT_STATE_ID="8" EVENT_ID="20">
         <action ID="3005">
           <!-- AcATTRIBUTATION -->
           <intParameter NAME="attribute_id" VALUE="0" />
         </action>
       </transition>
       <transition NAME="attributation" NEXT_STATE_ID="8" EVENT_ID="21">
         <action ID="3005">
           <!-- AcATTRIBUTATION -->
           <intParameter NAME="attribute_id" VALUE="1" />
         </action>
       </transition>
       <transition NAME="attributation" NEXT_STATE_ID="8" EVENT_ID="30">
         <action ID="3005">
           <!-- AcATTRIBUTATION -->
           <intParameter NAME="attribute_id" VALUE="2" />
         </action>
       </transition>
       <transition NAME="attributation" NEXT_STATE_ID="8" EVENT_ID="31">
         <action ID="3005">
           <!-- AcATTRIBUTATION -->
           <intParameter NAME="attribute_id" VALUE="3" />
         </action>
       </transition>
       <transition NAME="attributation" NEXT_STATE_ID="8" EVENT_ID="40">
         <action ID="3005">
           <!-- AcATTRIBUTATION -->
           <intParameter NAME="attribute_id" VALUE="4" />
         </action>
       </transition>
       <transition NAME="default" NEXT_STATE_ID="1" EVENT_ID="90">
         <action ID="3007">
           <!-- AcDEFAULT -->
         </action>
       </transition>
     </state>
     <state NAME="TwoPointsPicked" ID="9" X_POS="748" Y_POS="140" WIDTH="100" HEIGHT="50">
       <transition NAME="ENew" NEXT_STATE_ID="1" EVENT_ID="13">
         <action ID="81">
           <!-- AcNEWSUBOBJECT -->
         </action>
       </transition>
       <transition NAME="deselectAll" NEXT_STATE_ID="1" EVENT_ID="14">
         <action ID="72">
           <!-- AcDESELECTALL -->
         </action>
       </transition>
       <transition NAME="setVesselElement" NEXT_STATE_ID="9" EVENT_ID="91">
         <action ID="3008">
           <!-- AcSETVESSELELEMENT-->
         </action>
       </transition>
     </state>
     <state NAME="CheckPicking" ID="10" X_POS="642" Y_POS="805" WIDTH="100" HEIGHT="50">
       <transition NAME="noPicked" NEXT_STATE_ID="12" EVENT_ID="1003">
         <action ID="36">
           <!--AcCHECKGREATERTWO-->
         </action>
       </transition>
       <transition NAME="yesPicked" NEXT_STATE_ID="14" EVENT_ID="1004">
         <action ID="69">
           <!-- AcSELECTSUBOBJECT  -->
         </action>
         <action ID="3010">
           <!-- AcCHECKBARRIERSTATUS -->
         </action>
       </transition>
     </state>
     <state NAME="MoreVesselsPicked" ID="11" X_POS="933" Y_POS="754" WIDTH="100" HEIGHT="50">
       <transition NAME="delete" NEXT_STATE_ID="1" EVENT_ID="12">
         <action ID="104">
           <!-- AcDESELECTALL -->
         </action>
       </transition>
       <transition NAME="goToCheckPicking" NEXT_STATE_ID="10" EVENT_ID="5">
         <action ID="31">
           <!-- AcCHECKOBJECT  -->
         </action>
       </transition>
       <transition NAME="goToCheckPicking" NEXT_STATE_ID="10" EVENT_ID="8">
         <action ID="31">
           <!-- AcCHECKOBJECT  -->
         </action>
       </transition>
       <transition NAME="deselectAll" NEXT_STATE_ID="1" EVENT_ID="14">
         <action ID="72">
           <!-- AcDESELECTALL -->
         </action>
       </transition>
       <transition NAME="singleSignal" NEXT_STATE_ID="3" EVENT_ID="19">
         <action ID="3004">
           <!-- AcSINGLE -->
         </action>
       </transition>
       <!--now follow the attibutations for different vessel types-->
       <transition NAME="attributation" NEXT_STATE_ID="11" EVENT_ID="20">
         <action ID="3005">
           <!-- AcATTRIBUTATION -->
           <intParameter NAME="attribute_id" VALUE="0" />
         </action>
       </transition>
       <transition NAME="attributation" NEXT_STATE_ID="11" EVENT_ID="21">
         <action ID="3005">
           <!-- AcATTRIBUTATION -->
           <intParameter NAME="attribute_id" VALUE="1" />
         </action>
       </transition>
       <transition NAME="attributation" NEXT_STATE_ID="11" EVENT_ID="30">
         <action ID="3005">
           <!-- AcATTRIBUTATION -->
           <intParameter NAME="attribute_id" VALUE="2" />
         </action>
       </transition>
       <transition NAME="attributation" NEXT_STATE_ID="11" EVENT_ID="31">
         <action ID="3005">
           <!-- AcATTRIBUTATION -->
           <intParameter NAME="attribute_id" VALUE="3" />
         </action>
       </transition>
       <transition NAME="attributation" NEXT_STATE_ID="11" EVENT_ID="40">
         <action ID="3005">
           <!-- AcATTRIBUTATION -->
           <intParameter NAME="attribute_id" VALUE="4" />
         </action>
       </transition>
       <transition NAME="default" NEXT_STATE_ID="1" EVENT_ID="90">
         <action ID="3007">
           <!-- AcDEFAULT -->
         </action>
       </transition>
     </state>
     <state NAME="CheckNumberPickedVesselsSmaller2" ID="12" X_POS="259" Y_POS="707" WIDTH="188" HEIGHT="50">
       <transition NAME="yes" NEXT_STATE_ID="8" EVENT_ID="1004" />
       <transition NAME="no" NEXT_STATE_ID="11" EVENT_ID="1003">
         <action ID="69">
           <!-- AcSELECTSUBOBJECT  -->
         </action>
       </transition>
     </state>
     <state NAME="CheckBarrierStatus" ID="13" X_POS="8" Y_POS="318" WIDTH="100" HEIGHT="50">
       <transition NAME="yes" NEXT_STATE_ID="3" EVENT_ID="1004" />
       <transition NAME="no" NEXT_STATE_ID="8" EVENT_ID="1003" />
     </state>
     <state NAME="CheckBarrierStatus" ID="14" X_POS="557" Y_POS="510" WIDTH="100" HEIGHT="50">
       <transition NAME="yes" NEXT_STATE_ID="8" EVENT_ID="1004" />
       <transition NAME="no" NEXT_STATE_ID="11" EVENT_ID="1003" />
     </state>
   </stateMachine>
   <stateMachine NAME="slices-rotator">
     <state NAME="neutral" ID="1" START_STATE="TRUE">
       <!-- mouse down: jump to decision state -->
       <transition NAME="mouse down" NEXT_STATE_ID="2" EVENT_ID="1">
         <action ID="21">
           <!-- AcCheckPoint -->
         </action>
       </transition>
       <transition NAME="mouse move" NEXT_STATE_ID="5" EVENT_ID="520">
         <action ID="21">
           <!-- AcCheckPoint -->
         </action>
       </transition>
     </state>
     <state NAME="rotate?" ID="2">
       <transition NAME="yes" NEXT_STATE_ID="3" EVENT_ID="1004" />
       <transition NAME="no" NEXT_STATE_ID="4" EVENT_ID="1003">
         <action ID="92">
           <!--AcMove-->
         </action>
       </transition>
     </state>
     <state NAME="rotate" ID="3">
       <!-- send rotate events -->
       <transition NAME="mouse move" NEXT_STATE_ID="3" EVENT_ID="530">
         <action ID="1005">
           <!--AcRotate-->
         </action>
       </transition>
       <transition NAME="mouse release" NEXT_STATE_ID="1" EVENT_ID="505">
         <action ID="1010">
           <!--AcRotateEnd-->
         </action>
       </transition>
     </state>
     <state NAME="move" ID="4">
       <!-- send move events -->
       <transition NAME="mouse move" NEXT_STATE_ID="4" EVENT_ID="530">
         <action ID="92">
           <!--AcMove-->
         </action>
       </transition>
       <transition NAME="mouse release" NEXT_STATE_ID="1" EVENT_ID="505" />
     </state>
     <state NAME="rotation possible?" ID="5">
       <transition NAME="yes" NEXT_STATE_ID="6" EVENT_ID="1004">
         <action ID="1004">
           <!--AcRotateStart-->
         </action>
       </transition>
       <transition NAME="no" NEXT_STATE_ID="1" EVENT_ID="1003" />
     </state>
     <state NAME="rotation possible!" ID="6">
       <!-- mouse down: jump to decision state -->
       <transition NAME="mouse down" NEXT_STATE_ID="2" EVENT_ID="1">
         <action ID="21">
           <!-- AcCheckPoint -->
         </action>
       </transition>
       <transition NAME="mouse move" NEXT_STATE_ID="7" EVENT_ID="520">
         <action ID="21">
           <!-- AcCheckPoint -->
         </action>
       </transition>
     </state>
     <state NAME="rotation possible?" ID="7">
       <transition NAME="yes" NEXT_STATE_ID="6" EVENT_ID="1004" />
       <transition NAME="no" NEXT_STATE_ID="1" EVENT_ID="1003">
         <action ID="1010">
           <!--AcRotateEnd-->
         </action>
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="dummy">
     <!-- Dummy for a null interaction -->
     <state NAME="neutral" ID="0" START_STATE="TRUE">
       <transition NAME="stay in dummy" NEXT_STATE_ID="0" EVENT_ID="0" />
     </state>
   </stateMachine>
   <stateMachine NAME="SpaceNavigatorInteraction">
     <state NAME="neutral" ID="1" START_STATE="TRUE">
       <transition NAME="stay in dummy" NEXT_STATE_ID="1" EVENT_ID="4001">
         <action ID="4001" />
         <!--AcONTDMOUSEINPUT-->
       </transition>
       <transition NAME="stay with button down" NEXT_STATE_ID="1" EVENT_ID="4002">
         <action ID="4002" />
         <!--AcONTDMOUSEKEYDOWN-->
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="WiiMoteHeadtracking">
     <state NAME="headtracking" ID="1" START_STATE="TRUE">
       <transition NAME="startState" NEXT_STATE_ID="1" EVENT_ID="4003">
         <!--EIDWIIMOTEINPUT-->
         <action ID="4003" />
         <!--AcONWIIMOTEINPUT-->
       </transition>
       <transition NAME="buttonState" NEXT_STATE_ID="1" EVENT_ID="4004">
         <!--EIDWIIMOTEBUTTON-->
         <action ID="4004" />
         <!--AcRESETVIEW-->
       </transition>
       <transition NAME="initCalibration" NEXT_STATE_ID="2" EVENT_ID="5551001">
         <!--EV_INIT-->
         <action ID="55500010" />
         <!--AC_INIT-->
       </transition>
     </state>
     <state NAME="calibration" ID="2">
       <transition NAME="collectIRData" NEXT_STATE_ID="2" EVENT_ID="4003">
         <!--EIDWIIMOTEINPUT-->
         <action ID="21" />
         <!--AcCHECKPOINT-->
       </transition>
       <transition NAME="endCalibration" NEXT_STATE_ID="1" EVENT_ID="5551001">
         <!--EV_INIT-->
         <action ID="44" />
         <!--AcFINISH-->
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="WiiMoteSurfaceInteraction">
     <state NAME="start" ID="1" START_STATE="TRUE">
       <transition NAME="initial state" NEXT_STATE_ID="2" EVENT_ID="4005" />
       <!--EIDWIIMOTEBUTTONB-->
       <transition NAME="reset object" NEXT_STATE_ID="1" EVENT_ID="4004">
         <!--EIDWIIMOTEBUTTON-->
         <action ID="4004" />
         <!--AcRESETVIEW-->
       </transition>
     </state>
     <state NAME="Surface Interaction" ID="2">
       <transition NAME="stop Surface Interaction" NEXT_STATE_ID="1" EVENT_ID="5551008">
         <!--EV_DONE-->
         <action ID="4005">
           <!-- AcONWIIMOTEBUTTONRELEASED -->
         </action>
       </transition>
       <transition NAME="Input for Surface Interaction" NEXT_STATE_ID="2" EVENT_ID="4003">
         <!--EIDWIIMOTEINPUT-->
         <action ID="4003">
           <!--AcONWIIMOTEINPUT-->
         </action>
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="InteractorTestPattern">
     <!-- To Test an Interactor for the right behavior -->
     <state NAME="neutral" ID="0" START_STATE="TRUE">
       <transition NAME="to1" NEXT_STATE_ID="1" EVENT_ID="4">
         <action ID="1101" />
         <!--AcMODESELECT-->
       </transition>
       <transition NAME="to2" NEXT_STATE_ID="2" EVENT_ID="2">
         <action ID="1011" />
         <!--AcMODESELECT-->
       </transition>
     </state>
     <state NAME="State1" ID="1">
       <transition NAME="StayIn1" NEXT_STATE_ID="1" EVENT_ID="533" />
       <transition NAME="to0" NEXT_STATE_ID="0" EVENT_ID="506">
         <action ID="1100" />
         <!--AcMODEDESELECT-->
       </transition>
     </state>
     <state NAME="State2" ID="2">
       <transition NAME="StayIn2" NEXT_STATE_ID="2" EVENT_ID="531" />
       <transition NAME="finish" NEXT_STATE_ID="0" EVENT_ID="507">
         <action ID="1100" />
         <!--AcMODEDESELECT-->
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="shapemodelpointsetinteractor">
     <state NAME="Interaction Activated, no point loaded yet" ID="1" START_STATE="TRUE" X_POS="457" Y_POS="506" WIDTH="226" HEIGHT="56">
       <transition NAME="SetStateMachineOnDeselected" EVENT_ID="1031" NEXT_STATE_ID="1">
         <action ID="1100" />
       </transition>
       <transition NAME="SetStateMachineOnSelected" EVENT_ID="1030" NEXT_STATE_ID="1">
         <action ID="1101" />
       </transition>
       <transition NAME="Add Point" EVENT_ID="3" NEXT_STATE_ID="2">
         <action ID="10" />
       </transition>
     </state>
     <state NAME="One Point" ID="2" X_POS="567" Y_POS="145" WIDTH="100" HEIGHT="50">
       <transition NAME="Move Point" EVENT_ID="3" NEXT_STATE_ID="2">
         <action ID="103" />
         <action ID="10" />
       </transition>
       <transition NAME="Remove Point" EVENT_ID="12" NEXT_STATE_ID="1">
         <action ID="100" />
       </transition>
       <transition NAME="Check if point is hit by mouse click" EVENT_ID="1" NEXT_STATE_ID="3">
         <action ID="30" />
       </transition>
       <transition NAME="name" EVENT_ID="14" NEXT_STATE_ID="2">
         <action ID="72" />
         <action ID="1100" />
       </transition>
     </state>
     <state NAME="CheckPoint" ID="3" X_POS="64" Y_POS="52" WIDTH="100" HEIGHT="50">
       <transition NAME="Point not hit" EVENT_ID="1003" NEXT_STATE_ID="2">
         <action ID="72" />
         <action ID="1100" />
       </transition>
       <transition NAME="Point is hit, check if is selected or not" EVENT_ID="1004" NEXT_STATE_ID="5">
         <action ID="34" />
         <action ID="1101" />
       </transition>
     </state>
     <state NAME="PointMove" ID="4" X_POS="278" Y_POS="422" WIDTH="100" HEIGHT="50">
       <transition NAME="Adjust the Mesh according to point move" EVENT_ID="505" NEXT_STATE_ID="2">
         <action ID="42" />
       </transition>
       <transition NAME="name" EVENT_ID="530" NEXT_STATE_ID="4">
         <action ID="1236" />
         <action ID="91" />
         <action ID="1234" />
       </transition>
       <transition NAME="name" EVENT_ID="1" NEXT_STATE_ID="4">
         <action ID="8" />
       </transition>
     </state>
     <state NAME="Already Selected?" ID="5" X_POS="187" Y_POS="247" WIDTH="100" HEIGHT="50">
       <transition NAME="Initialize Movement" EVENT_ID="1004" NEXT_STATE_ID="4">
         <action ID="8" />
         <action ID="1235" />
       </transition>
       <transition NAME="name" EVENT_ID="1003" NEXT_STATE_ID="2">
         <action ID="60" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="singlepointinteractor">
     <!-- Behaviour of one point. This single point can be set, selected and then moved and removed. A setting of a new point will delete the old one.-->
     <state NAME="no point or loaded point not selected" ID="1" START_STATE="TRUE" X_POS="18" Y_POS="336" WIDTH="197" HEIGHT="50">
       <transition NAME="SetThisStatemachineOnSelected" NEXT_STATE_ID="1" EVENT_ID="1030">
         <action ID="1101">
           <!--AcMODE_SELECT-->
         </action>
       </transition>
       <transition NAME="SetThisStatemachineOnDeselected" NEXT_STATE_ID="1" EVENT_ID="1031">
         <action ID="1100">
           <!--AcMODE_DESELECT-->
         </action>
       </transition>
       <transition NAME="addPoint but check n" NEXT_STATE_ID="42" EVENT_ID="3">
         <action ID="1101">
           <!--AcMODE_SELECT-->
         </action>
         <action ID="103" />
         <action ID="10" />
       </transition>
       <transition NAME="name" EVENT_ID="1" NEXT_STATE_ID="43">
         <action ID="30" />
       </transition>
     </state>
     <state NAME="picked" ID="20" X_POS="693" Y_POS="587" WIDTH="100" HEIGHT="50">
       <transition NAME="StNO" NEXT_STATE_ID="1" EVENT_ID="1003">
         <action ID="72">
           <!--AcDESELECTALL-->
         </action>
         <action ID="1100">
           <!--AcMODEDESELECT-->
         </action>
       </transition>
       <transition NAME="StYes" NEXT_STATE_ID="22" EVENT_ID="1004">
         <action ID="8">
           <!--AcINITMOVEMENT-->
         </action>
         <action ID="1101" />
       </transition>
     </state>
     <state NAME="move point" ID="22" X_POS="1135" Y_POS="449" WIDTH="100" HEIGHT="50">
       <!--  since the MouseMove Event is send by QT we don't have the information about the position of the point in the list. we had it before, when we checked, if it was picked, or if it was selected -->
       <transition NAME="move point" NEXT_STATE_ID="22" EVENT_ID="530">
         <action ID="91" />
       </transition>
       <transition NAME="Safety init" NEXT_STATE_ID="22" EVENT_ID="1">
         <action ID="8" />
       </transition>
       <transition NAME="finish move" NEXT_STATE_ID="42" EVENT_ID="505">
         <action ID="42" />
       </transition>
     </state>
     <state NAME="point selected" ID="42" X_POS="674" Y_POS="341" WIDTH="100" HEIGHT="50">
       <transition NAME="Select or move point FULL" NEXT_STATE_ID="20" EVENT_ID="1">
         <action ID="30">
           <!--AcCHECKELEMENT-->
         </action>
       </transition>
       <transition NAME="StYes" NEXT_STATE_ID="1" EVENT_ID="12">
         <action ID="100" />
         <action ID="1100">
           <!--AcMODEDESELECT-->
         </action>
       </transition>
       <transition NAME="name" EVENT_ID="3" NEXT_STATE_ID="42">
         <action ID="103" />
         <action ID="10" />
       </transition>
     </state>
     <state NAME="picked not yet selected" ID="43" X_POS="681" Y_POS="158" WIDTH="126" HEIGHT="50">
       <transition NAME="name" EVENT_ID="1004" NEXT_STATE_ID="42">
         <action ID="60" />
       </transition>
       <transition NAME="name" EVENT_ID="1003" NEXT_STATE_ID="1">
         <action ID="72" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="moveNzoom">
     <state NAME="neutral" ID="0" START_STATE="TRUE" X_POS="288" Y_POS="81" WIDTH="100" HEIGHT="50">
       <transition NAME="initmove" NEXT_STATE_ID="1" EVENT_ID="4">
         <action ID="9" />
       </transition>
       <transition NAME="initzoom" NEXT_STATE_ID="2" EVENT_ID="2">
         <action ID="1011" />
       </transition>
     </state>
     <state NAME="move" ID="1" X_POS="170" Y_POS="413" WIDTH="100" HEIGHT="50">
       <transition NAME="move" NEXT_STATE_ID="1" EVENT_ID="533">
         <action ID="92" />
       </transition>
       <transition NAME="finish" NEXT_STATE_ID="0" EVENT_ID="506">
         <action ID="43" />
       </transition>
     </state>
     <state NAME="zoom" ID="2" X_POS="584" Y_POS="432" WIDTH="100" HEIGHT="50">
       <transition NAME="zoom" NEXT_STATE_ID="2" EVENT_ID="531">
         <action ID="1012" />
       </transition>
       <transition NAME="finish" NEXT_STATE_ID="0" EVENT_ID="507" />
     </state>
   </stateMachine>
   <stateMachine NAME="OnePointDoubleClickInteraction">
     <state NAME="empty" ID="0" START_STATE="TRUE">
       <transition NAME="doubleclick" NEXT_STATE_ID="1" EVENT_ID="8">
         <action ID="10" />
       </transition>
       <transition NAME="delete" NEXT_STATE_ID="0" EVENT_ID="12">
         <action ID="103" />
       </transition>
     </state>
     <state NAME="point available" ID="1">
       <transition NAME="doubleclick" NEXT_STATE_ID="1" EVENT_ID="8">
         <action ID="103" />
         <action ID="10" />
       </transition>
       <transition NAME="delete" NEXT_STATE_ID="0" EVENT_ID="12">
         <action ID="103" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="OnePointMouseMoveInteraction">
     <state NAME="empty" ID="0" START_STATE="TRUE">
       <transition NAME="mousemove" NEXT_STATE_ID="1" EVENT_ID="520">
         <action ID="1101" />
         <!--AcMODE_SELECT-->
         <action ID="10" />
         <!-- Add Point -->
       </transition>
       <transition NAME="mousewheelmove" NEXT_STATE_ID="1" EVENT_ID="9">
         <action ID="1101" />
         <!--AcMODE_SELECT-->
         <action ID="10" />
         <!-- Add Point -->
       </transition>
       <transition NAME="deleteSafety" NEXT_STATE_ID="0" EVENT_ID="12">
         <action ID="103" />
         <!-- Remove Point -->
         <action ID="1100" />
         <!--AcMODEDESELECT-->
       </transition>
     </state>
     <state NAME="point available" ID="1">
       <transition NAME="mousemove" NEXT_STATE_ID="1" EVENT_ID="520">
         <action ID="1101" />
         <!--AcMODE_SELECT-->
         <action ID="103" />
         <!-- Remove Point -->
         <action ID="10" />
         <!-- Add Point -->
       </transition>
       <transition NAME="mousewheelmove" NEXT_STATE_ID="1" EVENT_ID="9">
         <action ID="1101" />
         <!--AcMODE_SELECT-->
         <action ID="103" />
         <!-- Remove Point -->
         <action ID="10" />
         <!-- Add Point -->
       </transition>
       <transition NAME="delete" NEXT_STATE_ID="0" EVENT_ID="12">
         <action ID="103" />
         <!-- Remove Point -->
         <action ID="1100" />
         <!--AcMODEDESELECT-->
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="CurveModelInteractor">
     <!-- Behaviour of a set of Points. a defined number of points can be set/removed/selected/deselectd/moved -->
     <state NAME="Start" ID="42" START_STATE="TRUE" X_POS="918" Y_POS="441" WIDTH="100" HEIGHT="50">
       <transition NAME="name" EVENT_ID="1" NEXT_STATE_ID="43">
         <action ID="21" />
       </transition>
     </state>
     <state NAME="IsPointSelected" ID="43" X_POS="470" Y_POS="441" WIDTH="100" HEIGHT="50">
       <transition NAME="name" EVENT_ID="1003" NEXT_STATE_ID="42">
         <action ID="72" />
       </transition>
       <transition NAME="name" EVENT_ID="1004" NEXT_STATE_ID="44" />
     </state>
     <state NAME="PointSelected" ID="44" X_POS="690" Y_POS="204" WIDTH="100" HEIGHT="50">
       <transition NAME="name" EVENT_ID="530" NEXT_STATE_ID="44">
         <action ID="91" />
       </transition>
       <transition NAME="name" EVENT_ID="505" NEXT_STATE_ID="42">
         <action ID="43" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="singlepointinteractorwithoutshiftclick">
     <!-- Behaviour of one point. This single point can be set, selected and then moved and removed. A setting of a new point will delete the old one.-->
     <state NAME="no point or loaded point not selected" ID="1" START_STATE="TRUE" X_POS="18" Y_POS="336" WIDTH="197" HEIGHT="50">
       <transition NAME="SetThisStatemachineOnSelected" NEXT_STATE_ID="1" EVENT_ID="1030">
         <action ID="1101">
           <!--AcMODE_SELECT-->
         </action>
       </transition>
       <transition NAME="SetThisStatemachineOnDeselected" NEXT_STATE_ID="1" EVENT_ID="1031">
         <action ID="1100">
           <!--AcMODE_DESELECT-->
         </action>
       </transition>
       <transition NAME="addPoint" NEXT_STATE_ID="2" EVENT_ID="1">
         <action ID="1101" />
         <!--AcMODE_SELECT-->
         <action ID="103" />
         <!--AcREMOVEALL-->
         <action ID="10" />
         <!--AcADDPOINT-->
       </transition>
     </state>
     <state NAME="point selected" ID="2" X_POS="674" Y_POS="341" WIDTH="100" HEIGHT="50">
       <transition NAME="delete point" NEXT_STATE_ID="1" EVENT_ID="12">
         <action ID="100" />
         <!--AcREMOVEPOINT-->
         <action ID="1100">
           <!--AcMODEDESELECT-->
         </action>
       </transition>
       <transition NAME="set point" NEXT_STATE_ID="2" EVENT_ID="1">
         <action ID="103" />
         <!--AcREMOVEALL-->
         <action ID="10" />
         <!--AcADDPOINT-->
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="SeedpointCorrection">
     <state NAME="position check" ID="0" START_STATE="TRUE" X_POS="18" Y_POS="336" WIDTH="197" HEIGHT="50">
       <transition NAME="nothing found" NEXT_STATE_ID="0" EVENT_ID="1003">
         <action ID="48008" />
       </transition>
       <transition NAME="inside" NEXT_STATE_ID="1" EVENT_ID="1004">
         <action ID="31" />
         <transition NAME="check position" NEXT_STATE_ID="0" EVENT_ID="520">
           <action ID="5000" />
         </transition>
         <transition NAME="check position 2" NEXT_STATE_ID="0" EVENT_ID="530">
           <action ID="5000" />
         </transition>
         <transition NAME="change BoundingBox" NEXT_STATE_ID="3" EVENT_ID="1013">
           <action ID="65" />
         </transition>
       </transition>
     </state>
     <state NAME="edit seedpoints" ID="1" X_POS="18" Y_POS="336" WIDTH="197" HEIGHT="50">
       <transition NAME="back to start" NEXT_STATE_ID="0" EVENT_ID="520">
         <action ID="12" />
       </transition>
       <transition NAME="initialize correction" NEXT_STATE_ID="2" EVENT_ID="530">
         <action ID="5001" />
       </transition>
     </state>
     <state NAME="correct segmentation" ID="2" X_POS="18" Y_POS="336" WIDTH="197" HEIGHT="50">
       <transition NAME="draw contour" NEXT_STATE_ID="2" EVENT_ID="530">
         <action ID="92" />
       </transition>
       <transition NAME="calculate result" NEXT_STATE_ID="0" EVENT_ID="505">
         <action ID="5002" />
       </transition>
     </state>
     <state NAME="init BoundingBox Resizing" ID="3" X_POS="18" Y_POS="336" WIDTH="197" HEIGHT="50">
       <transition NAME="back to start 2" NEXT_STATE_ID="0" EVENT_ID="520">
         <action ID="5000" />
       </transition>
       <transition NAME="add boundingboxinteractor" NEXT_STATE_ID="4" EVENT_ID="1">
         <action ID="5003" />
       </transition>
     </state>
     <state NAME="BoundingBox Resizing" ID="4" X_POS="18" Y_POS="336" WIDTH="197" HEIGHT="50">
       <transition NAME="calculate result 2" NEXT_STATE_ID="0" EVENT_ID="23">
         <action ID="5004" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="BoundingBox Interaction">
     <state NAME="position check" ID="0" START_STATE="TRUE" X_POS="18" Y_POS="336" WIDTH="197" HEIGHT="50">
       <transition NAME="test" NEXT_STATE_ID="1" EVENT_ID="1">
         <action ID="5000" />
       </transition>
       <transition NAME="test" NEXT_STATE_ID="3" EVENT_ID="520">
         <action ID="5000" />
       </transition>
     </state>
     <state NAME="boundingbox resizing initialization" ID="1" X_POS="18" Y_POS="336" WIDTH="197" HEIGHT="50">
       <transition NAME="nothing found" NEXT_STATE_ID="0" EVENT_ID="1003">
         <action ID="47" />
       </transition>
       <transition NAME="something found" NEXT_STATE_ID="2" EVENT_ID="1004">
         <action ID="94" />
         <action ID="110" />
       </transition>
     </state>
     <state NAME="teststate" ID="2" X_POS="18" Y_POS="336" WIDTH="197" HEIGHT="50">
       <transition NAME="test 2" NEXT_STATE_ID="2" EVENT_ID="530">
         <action ID="11" />
       </transition>
       <transition NAME="test 3" NEXT_STATE_ID="0" EVENT_ID="505">
         <action ID="5" />
       </transition>
       <transition NAME="test 9" NEXT_STATE_ID="4" EVENT_ID="1003">
         <action ID="0" />
       </transition>
     </state>
     <state NAME="teststate 2" ID="3" X_POS="18" Y_POS="336" WIDTH="197" HEIGHT="50">
       <transition NAME="test 4" NEXT_STATE_ID="3" EVENT_ID="1004">
         <action ID="94" />
       </transition>
       <transition NAME="test 5" NEXT_STATE_ID="0" EVENT_ID="520">
         <action ID="5000" />
       </transition>
       <transition NAME="test 6" NEXT_STATE_ID="0" EVENT_ID="1003">
         <action ID="47" />
       </transition>
       <transition NAME="test 7" NEXT_STATE_ID="1" EVENT_ID="1">
         <action ID="5000" />
       </transition>
     </state>
     <state NAME="teststate 2" ID="4" X_POS="18" Y_POS="336" WIDTH="197" HEIGHT="50">
       <transition NAME="test 8" NEXT_STATE_ID="4" EVENT_ID="530">
         <action ID="0" />
       </transition>
       <transition NAME="test 9" NEXT_STATE_ID="0" EVENT_ID="505">
         <action ID="0" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="ToolWithWheelInteraction">
     <state NAME="ToolIdle" ID="1" START_STATE="TRUE" X_POS="167" Y_POS="365" WIDTH="100" HEIGHT="50">
       <transition NAME="MouseWheel" EVENT_ID="9" NEXT_STATE_ID="1">
         <action ID="105" />
       </transition>
       <transition NAME="send Koordinates press" NEXT_STATE_ID="2" EVENT_ID="1">
         <action ID="80" />
       </transition>
       <transition NAME="MouseMove" EVENT_ID="520" NEXT_STATE_ID="1">
         <action ID="92" />
       </transition>
       <transition NAME="name" EVENT_ID="26" NEXT_STATE_ID="1">
         <action ID="106" />
       </transition>
       <transition NAME="name" EVENT_ID="27" NEXT_STATE_ID="1">
         <action ID="107" />
       </transition>
     </state>
     <state NAME="ToolInUse" ID="2" X_POS="511" Y_POS="372" WIDTH="100" HEIGHT="50">
       <transition NAME="send Koordinates move" NEXT_STATE_ID="2" EVENT_ID="530">
         <action ID="90" />
       </transition>
       <transition NAME="send Koordinates release" NEXT_STATE_ID="1" EVENT_ID="505">
         <action ID="42" />
       </transition>
       <transition NAME="MouseWheel" EVENT_ID="9" NEXT_STATE_ID="2">
         <action ID="105" />
       </transition>
       <transition NAME="name" EVENT_ID="26" NEXT_STATE_ID="2">
         <action ID="106" />
       </transition>
       <transition NAME="name" EVENT_ID="27" NEXT_STATE_ID="2">
         <action ID="107" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="AffineInteractor3D">
     <state NAME="Start" ID="1" START_STATE="TRUE" X_POS="65" Y_POS="267" WIDTH="100" HEIGHT="50">
       <transition NAME="name" EVENT_ID="520" NEXT_STATE_ID="2">
         <action ID="31" />
       </transition>
     </state>
     <state NAME="IsOverObject" ID="2" X_POS="352" Y_POS="267" WIDTH="100" HEIGHT="50">
       <transition NAME="name" EVENT_ID="1003" NEXT_STATE_ID="1">
         <action ID="70" />
       </transition>
       <transition NAME="name" EVENT_ID="1004" NEXT_STATE_ID="3">
         <action ID="60" />
       </transition>
       <transition NAME="name" EVENT_ID="9" NEXT_STATE_ID="2">
         <action ID="49014" />
       </transition>
     </state>
     <state NAME="ObjectSelected" ID="3" X_POS="719" Y_POS="268" WIDTH="100" HEIGHT="50">
       <transition NAME="name" EVENT_ID="520" NEXT_STATE_ID="2">
         <action ID="31" />
       </transition>
       <transition NAME="name" EVENT_ID="1" NEXT_STATE_ID="4">
         <action ID="9" />
       </transition>
       <transition NAME="name" EVENT_ID="9" NEXT_STATE_ID="3">
         <action ID="49014" />
       </transition>
     </state>
     <state NAME="ObjectInteraction" ID="4" X_POS="598" Y_POS="629" WIDTH="100" HEIGHT="50">
       <transition NAME="name" EVENT_ID="530" NEXT_STATE_ID="4">
         <action ID="92" />
       </transition>
       <transition NAME="name" EVENT_ID="505" NEXT_STATE_ID="2">
         <action ID="31" />
       </transition>
       <transition NAME="name" EVENT_ID="521" NEXT_STATE_ID="4">
         <action ID="49014" />
         <action ID="92" />
       </transition>
     </state>
   </stateMachine>
-  <stateMachine NAME="CtrlZoom">
+  <stateMachine NAME="alternativeZoom">
     <state NAME="neutral" ID="0" START_STATE="TRUE" X_POS="288" Y_POS="81" WIDTH="100" HEIGHT="50">
       <transition NAME="initzoom" NEXT_STATE_ID="1" EVENT_ID="7">
         <action ID="1011" />
       </transition>
     </state>
     <state NAME="zoom" ID="1" X_POS="584" Y_POS="432" WIDTH="100" HEIGHT="50">
       <transition NAME="CtrlZoom" NEXT_STATE_ID="1" EVENT_ID="535">
         <action ID="1012" />
       </transition>
       <transition NAME="finish" NEXT_STATE_ID="0" EVENT_ID="538" />
     </state>
   </stateMachine>
-  <stateMachine NAME="ShiftClickPan">
+  <stateMachine NAME="alternativePan">
     <state NAME="neutral" ID="0" START_STATE="TRUE" X_POS="288" Y_POS="81" WIDTH="100" HEIGHT="50">
       <transition NAME="initshiftmove" NEXT_STATE_ID="1" EVENT_ID="644">
         <action ID="9" />
       </transition>
       <transition NAME="altinitshiftmove" NEXT_STATE_ID="1" EVENT_ID="2000">
         <action ID="9" />
       </transition>
     </state>
     <state NAME="shiftmove" ID="1" X_POS="170" Y_POS="413" WIDTH="100" HEIGHT="50">
       <transition NAME="shiftmove" NEXT_STATE_ID="1" EVENT_ID="2001">
         <action ID="92" />
       </transition>
       <transition NAME="finish" NEXT_STATE_ID="0" EVENT_ID="2002">
         <action ID="43" />
       </transition>
       <transition NAME="altshiftmove" NEXT_STATE_ID="1" EVENT_ID="645">
         <action ID="92" />
       </transition>
       <transition NAME="altfinish" NEXT_STATE_ID="0" EVENT_ID="646">
         <action ID="43" />
       </transition>
     </state>
   </stateMachine>
-  <stateMachine NAME="RightClickLevelWindow">
+  <stateMachine NAME="alternativeLevelWindow">
     <state NAME="neutral" ID="0" START_STATE="TRUE" X_POS="288" Y_POS="81" WIDTH="100" HEIGHT="50">
       <transition NAME="initmove" NEXT_STATE_ID="1" EVENT_ID="2">
         <action ID="9" />
       </transition>
     </state>
     <state NAME="levelwindow" ID="1" X_POS="584" Y_POS="432" WIDTH="100" HEIGHT="50">
       <transition NAME="levelwindow" NEXT_STATE_ID="1" EVENT_ID="531">
         <action ID="1014" />
       </transition>
       <transition NAME="finish" NEXT_STATE_ID="0" EVENT_ID="507" />
     </state>
   </stateMachine>
-  <stateMachine NAME="LeftClickLevelWindow">
+  <stateMachine NAME="LevelWindow">
     <state NAME="neutral" ID="0" START_STATE="TRUE" X_POS="288" Y_POS="81" WIDTH="100" HEIGHT="50">
       <transition NAME="initmove" NEXT_STATE_ID="1" EVENT_ID="1">
         <action ID="9" />
       </transition>
     </state>
     <state NAME="levelwindow" ID="1" X_POS="584" Y_POS="432" WIDTH="100" HEIGHT="50">
       <transition NAME="levelwindow" NEXT_STATE_ID="1" EVENT_ID="530">
         <action ID="1014" />
       </transition>
       <transition NAME="finish" NEXT_STATE_ID="0" EVENT_ID="505" />
     </state>
   </stateMachine>
   <stateMachine NAME="PlanarFigureInteractor">
     <!-- Behaviour of a set of Points. a defined number of points can be set/removed/selected/deselectd/moved -->
     <state NAME="Start" ID="42" START_STATE="TRUE" X_POS="1368" Y_POS="736" WIDTH="100" HEIGHT="50">
       <transition NAME="name" EVENT_ID="0" NEXT_STATE_ID="49">
         <action ID="31" />
       </transition>
     </state>
     <state NAME="FigurePlaced" ID="45" X_POS="836" Y_POS="715" WIDTH="100" HEIGHT="50">
       <transition NAME="name" EVENT_ID="520" NEXT_STATE_ID="45">
         <action ID="90" />
       </transition>
       <transition NAME="name" EVENT_ID="8" NEXT_STATE_ID="54">
         <action ID="33" />
       </transition>
       <transition NAME="name" EVENT_ID="530" NEXT_STATE_ID="57">
         <action ID="90" />
       </transition>
       <transition NAME="name" EVENT_ID="1" NEXT_STATE_ID="58">
         <action ID="21" />
       </transition>
     </state>
     <state NAME="ControlPointSelected" ID="47" X_POS="74" Y_POS="665" WIDTH="128" HEIGHT="50">
       <transition NAME="name" EVENT_ID="530" NEXT_STATE_ID="47">
         <action ID="90" />
       </transition>
       <transition NAME="name" EVENT_ID="505" NEXT_STATE_ID="51">
         <action ID="76" />
       </transition>
     </state>
     <state NAME="IsLastControlPoint" ID="48" X_POS="1102" Y_POS="732" WIDTH="100" HEIGHT="50">
       <transition NAME="name" EVENT_ID="1004" NEXT_STATE_ID="42" />
       <transition NAME="name" EVENT_ID="1003" NEXT_STATE_ID="45">
         <action ID="10" />
       </transition>
     </state>
     <state NAME="IsPlaced" ID="49" X_POS="1302" Y_POS="201" WIDTH="100" HEIGHT="50">
       <transition NAME="name" EVENT_ID="1003" NEXT_STATE_ID="50" />
       <transition NAME="name" EVENT_ID="1004" NEXT_STATE_ID="51" />
     </state>
     <state NAME="PlaceFigure" ID="50" X_POS="868" Y_POS="293" WIDTH="100" HEIGHT="50">
       <transition NAME="name" EVENT_ID="1" NEXT_STATE_ID="45">
         <action ID="11" />
       </transition>
     </state>
     <state NAME="EditFigure" ID="51" X_POS="804" Y_POS="199" WIDTH="100" HEIGHT="50">
       <transition NAME="name" EVENT_ID="520" NEXT_STATE_ID="52">
         <action ID="341" />
       </transition>
     </state>
     <state NAME="IsOverFigure" ID="52" X_POS="340" Y_POS="170" WIDTH="100" HEIGHT="50">
       <transition NAME="name" EVENT_ID="1003" NEXT_STATE_ID="51" />
       <transition NAME="name" EVENT_ID="1004" NEXT_STATE_ID="53" />
     </state>
     <state NAME="FigureHover" ID="53" X_POS="563" Y_POS="326" WIDTH="115" HEIGHT="50">
       <transition NAME="name" EVENT_ID="520" NEXT_STATE_ID="52">
         <action ID="341" />
       </transition>
       <transition NAME="name" EVENT_ID="2" NEXT_STATE_ID="60">
         <action ID="60" />
       </transition>
       <transition NAME="name" EVENT_ID="1" NEXT_STATE_ID="65">
         <action ID="34" />
       </transition>
     </state>
     <state NAME="IsMinFigureFinished" ID="54" X_POS="972" Y_POS="929" WIDTH="110" HEIGHT="50">
       <transition NAME="name" EVENT_ID="1004" NEXT_STATE_ID="42" />
       <transition NAME="name" EVENT_ID="1003" NEXT_STATE_ID="45" />
     </state>
     <state NAME="ResetFigure" ID="55" X_POS="610" Y_POS="934" WIDTH="100" HEIGHT="50">
       <transition NAME="name" EVENT_ID="1003" NEXT_STATE_ID="47" />
       <transition NAME="name" EVENT_ID="1004" NEXT_STATE_ID="45" />
     </state>
     <state NAME="FigurePlacedByDrag" ID="57" X_POS="1047" Y_POS="391" WIDTH="138" HEIGHT="50">
       <transition NAME="name" EVENT_ID="530" NEXT_STATE_ID="57">
         <action ID="90" />
       </transition>
       <transition NAME="name" EVENT_ID="505" NEXT_STATE_ID="58">
         <action ID="21" />
       </transition>
     </state>
     <state NAME="IsPointValid" ID="58" X_POS="1212" Y_POS="555" WIDTH="100" HEIGHT="50">
       <transition NAME="name" EVENT_ID="1004" NEXT_STATE_ID="48">
         <action ID="32" />
       </transition>
       <transition NAME="name" EVENT_ID="1003" NEXT_STATE_ID="45" />
     </state>
     <state NAME="FigureSelectedForDelete" ID="60" X_POS="308" Y_POS="532" WIDTH="132" HEIGHT="50">
       <transition NAME="name" EVENT_ID="1004" NEXT_STATE_ID="52">
         <action ID="100" />
       </transition>
       <transition NAME="name" EVENT_ID="1003" NEXT_STATE_ID="52" >
         <action ID="48000" />
       </transition>
     </state>
     <state NAME="IsOverControlPoint" ID="59" X_POS="586" Y_POS="636" WIDTH="120" HEIGHT="50">
       <transition NAME="name" EVENT_ID="1004" NEXT_STATE_ID="55">
         <action ID="66" />
       </transition>
       <transition NAME="name" EVENT_ID="1003" NEXT_STATE_ID="47">
         <action ID="10" />
       </transition>
     </state>
     <state NAME="FigureSeleced" ID="65" X_POS="740" Y_POS="487" WIDTH="100" HEIGHT="50">
       <transition NAME="name" EVENT_ID="1003" NEXT_STATE_ID="53" />
       <transition NAME="name" EVENT_ID="1004" NEXT_STATE_ID="59">
         <action ID="60" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="FiberBundleInteractor">
     <!-- working with mitk::FiberBundles -->
     <state NAME="Start" ID="123451" START_STATE="TRUE" X_POS="1368" Y_POS="736" WIDTH="100" HEIGHT="50">
       <transition NAME="name" EVENT_ID="520" NEXT_STATE_ID="123451">
         <!-- on EIDMOUSEMOVE keep in state and do AcCHECKHOVERING (which throws EIDFIGUREHOVER or EIDNOFIGUREHOVER if applicable) -->
         <action ID="341" />
       </transition>
       <transition NAME="name" EVENT_ID="12340" NEXT_STATE_ID="123452">
         <!-- on EIDFIGUREHOVER go to HoverFiber and do nothing -->
         <!-- previously: AcSELECTPICKEDOBJECT -->
         <action ID="0" />
       </transition>
     </state>
     <state NAME="HoverFiber" ID="123452" X_POS="340" Y_POS="170" WIDTH="100" HEIGHT="50">
       <transition NAME="name" EVENT_ID="520" NEXT_STATE_ID="123452">
         <!-- on EIDMOUSEMOVE keep state and do AcCHECKHOVERING (which throws EIDFIGUREHOVER or EIDNOFIGUREHOVER if applicable) -->
         <action ID="341" />
       </transition>
       <transition NAME="name" EVENT_ID="12340" NEXT_STATE_ID="123452">
         <!-- on EIDFIGUREHOVER keep state and do nothing -->
         <!-- previously: AcSELECTPICKEDOBJECT -->
         <action ID="0" />
       </transition>
       <transition NAME="name" EVENT_ID="12341" NEXT_STATE_ID="123451">
         <!-- on EIDNOFIGUREHOVER go to Start and do nothing -->
         <!-- previously: AcDESELECTALL -->
         <action ID="0" />
       </transition>
       <transition NAME="name" EVENT_ID="1" NEXT_STATE_ID="123452">
         <!-- on EIDLEFTMOUSEBTN keep state and do AcREMOVE -->
         <action ID="101" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="BinaryImageInteractor">
     <state START_STATE="TRUE" NAME="UndecidedState" ID="1" X_POS="374" Y_POS="98" WIDTH="139" HEIGHT="50">
       <transition NAME="name" EVENT_ID="520" NEXT_STATE_ID="2" >
         <action ID="30" />
       </transition>
     </state>
     <state NAME="IsOverImage" ID="2" >
       <transition NAME="name" EVENT_ID="1003" NEXT_STATE_ID="1" />
       <transition NAME="name" EVENT_ID="1004" NEXT_STATE_ID="3" />
     </state>
     <state NAME="Hovering" ID="3" >
       <transition NAME="name" EVENT_ID="520" NEXT_STATE_ID="2">
         <action ID="30" />
       </transition>
       <transition NAME="name" EVENT_ID="1" NEXT_STATE_ID="11">
         <action ID="60" />
       </transition>
       <transition NAME="name" EVENT_ID="2" NEXT_STATE_ID="3">
         <action ID="61" />
       </transition>
       <transition NAME="name" EVENT_ID="1013" NEXT_STATE_ID="6">
         <action ID="6" />
       </transition>
     </state>
     <state NAME="CorrectionMode" ID="6" X_POS="749" Y_POS="498" WIDTH="188" HEIGHT="51">
       <transition NAME="name" EVENT_ID="1" NEXT_STATE_ID="7">
         <action ID="8" />
       </transition>
       <transition NAME="name" EVENT_ID="1002" NEXT_STATE_ID="1">
         <action ID="40">
           <!--End of correction mode - hide sphere-->
         </action>
       </transition>
       <transition NAME="name" EVENT_ID="27" NEXT_STATE_ID="6">
         <action ID="107" />
       </transition>
       <transition NAME="name" EVENT_ID="26" NEXT_STATE_ID="6">
         <action ID="106" />
       </transition>
       <transition NAME="name" EVENT_ID="520" NEXT_STATE_ID="6">
         <action ID="49006" />
       </transition>
       <transition NAME="name" EVENT_ID="9" NEXT_STATE_ID="6">
         <action ID="49006" />
       </transition>
       <transition NAME="name" EVENT_ID="630" NEXT_STATE_ID="6">
         <action ID="49007" />
       </transition>
     </state>
     <state NAME="DragSegmentationSurface" ID="7" X_POS="95" Y_POS="473" WIDTH="202" HEIGHT="50">
       <transition NAME="name" EVENT_ID="530" NEXT_STATE_ID="7">
         <action ID="90" />
       </transition>
       <transition NAME="name" EVENT_ID="505" NEXT_STATE_ID="7">
         <action ID="43" />
       </transition>
       <transition NAME="name" EVENT_ID="1002" NEXT_STATE_ID="1">
         <action ID="40" />
       </transition>
     </state>
     <state NAME="CheckIfImageIsSelected" ID="11" X_POS="771" Y_POS="201" WIDTH="255" HEIGHT="50">
       <transition NAME="name" EVENT_ID="1003" NEXT_STATE_ID="1" />
       <transition NAME="name" EVENT_ID="1004" NEXT_STATE_ID="6">
         <action ID="6">
           <!--Initialize correction mode, visualize a sphere-->
         </action>
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="Pan">
     <state NAME="neutral" ID="0" START_STATE="TRUE" X_POS="288" Y_POS="81" WIDTH="100" HEIGHT="50">
       <transition NAME="initmove" NEXT_STATE_ID="1" EVENT_ID="1">
         <action ID="9" />
       </transition>
       <transition NAME="initaltmove" NEXT_STATE_ID="1" EVENT_ID="600">
         <action ID="9" />
       </transition>
     </state>
     <state NAME="move" ID="1" X_POS="242" Y_POS="382" WIDTH="100" HEIGHT="50">
       <transition NAME="move" NEXT_STATE_ID="1" EVENT_ID="530">
         <action ID="92" />
       </transition>
       <transition NAME="altmove" NEXT_STATE_ID="1" EVENT_ID="610">
         <action ID="92" />
       </transition>
       <transition NAME="finish" NEXT_STATE_ID="0" EVENT_ID="505">
         <action ID="43" />
       </transition>
       <transition NAME="altfinish" NEXT_STATE_ID="0" EVENT_ID="620">
         <action ID="43" />
       </transition>
     </state>
   </stateMachine>
-  <stateMachine NAME="LeftClickScroll">
+  <stateMachine NAME="Scroll">
     <state NAME="neutral" ID="0" START_STATE="TRUE" X_POS="288" Y_POS="81" WIDTH="100" HEIGHT="50">
       <transition NAME="initmove" NEXT_STATE_ID="1" EVENT_ID="540">
         <action ID="9" />
       </transition>
       <transition NAME="altinitmove" EVENT_ID="600" NEXT_STATE_ID="1">
         <action ID="9" />
       </transition>
     </state>
     <state NAME="scroll" ID="1" X_POS="170" Y_POS="413" WIDTH="100" HEIGHT="50">
       <transition NAME="scroll" NEXT_STATE_ID="1" EVENT_ID="542">
         <action ID="1013" />
       </transition>
       <transition NAME="finish" NEXT_STATE_ID="0" EVENT_ID="543">
         <action ID="43" />
       </transition>
       <transition NAME="altfinish" EVENT_ID="620" NEXT_STATE_ID="0">
         <action ID="43" />
       </transition>
       <transition NAME="altscroll" EVENT_ID="610" NEXT_STATE_ID="1">
         <action ID="1013" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="Zoom">
     <state NAME="neutral" ID="0" START_STATE="TRUE" X_POS="288" Y_POS="81" WIDTH="100" HEIGHT="50">
       <transition NAME="initzoom" NEXT_STATE_ID="2" EVENT_ID="1">
         <action ID="1011" />
       </transition>
       <transition NAME="name" EVENT_ID="600" NEXT_STATE_ID="2">
         <action ID="1011" />
       </transition>
     </state>
     <state NAME="zoom" ID="2" X_POS="584" Y_POS="432" WIDTH="100" HEIGHT="50">
       <transition NAME="zoom" NEXT_STATE_ID="2" EVENT_ID="530">
         <action ID="1012" />
       </transition>
       <transition NAME="finish" NEXT_STATE_ID="0" EVENT_ID="505" />
       <transition NAME="name" EVENT_ID="620" NEXT_STATE_ID="0" />
       <transition NAME="name" EVENT_ID="610" NEXT_STATE_ID="2">
         <action ID="1012" />
       </transition>
     </state>
   </stateMachine>
   <stateMachine NAME="MouseWheelScroll">
     <state NAME="neutral" ID="0" START_STATE="TRUE" X_POS="288" Y_POS="81" WIDTH="100" HEIGHT="50">
       <transition NAME="name" EVENT_ID="9" NEXT_STATE_ID="0">
         <action ID="1015" />
       </transition>
       <transition NAME="name" EVENT_ID="640" NEXT_STATE_ID="0">
         <action ID="1015" />
       </transition>
     </state>
   </stateMachine>
-  <stateMachine NAME="MiddleClickScroll">
+  <stateMachine NAME="alternativeScroll">
     <state NAME="neutral" ID="0" START_STATE="TRUE" X_POS="288" Y_POS="81" WIDTH="100" HEIGHT="50">
       <transition NAME="initmove" NEXT_STATE_ID="1" EVENT_ID="4">
         <action ID="9" />
       </transition>
       <transition NAME="altinitmove" EVENT_ID="641" NEXT_STATE_ID="1">
         <action ID="9" />
       </transition>
     </state>
     <state NAME="scroll" ID="1" X_POS="170" Y_POS="413" WIDTH="100" HEIGHT="50">
       <transition NAME="scroll" NEXT_STATE_ID="1" EVENT_ID="533">
         <action ID="1013" />
       </transition>
       <transition NAME="finish" NEXT_STATE_ID="0" EVENT_ID="506">
         <action ID="43" />
       </transition>
       <transition NAME="altfinish" EVENT_ID="643" NEXT_STATE_ID="0">
         <action ID="43" />
       </transition>
       <transition NAME="altscroll" EVENT_ID="642" NEXT_STATE_ID="1">
         <action ID="1013" />
       </transition>
     </state>
   </stateMachine>
+  <stateMachine NAME="ContextMenuInteractor">
+    <state NAME="initial" ID="1" START_STATE="TRUE">
+      <transition NAME="press" NEXT_STATE_ID="2" EVENT_ID="2" />
+    </state>
+    <state NAME="contextmenu" ID="2" >
+      <transition NAME="moved" NEXT_STATE_ID="1" EVENT_ID="531" />
+      <transition NAME="contextmenu" NEXT_STATE_ID="1" EVENT_ID="507">
+        <action ID="30" />
+      </transition>
+    </state>
+  </stateMachine>
 </mitkInteraktionStates>
 <!-- DOCUMENTATION -->
 <!-- This is StateMachine.xml. Includes Information about different StateMachines and Events. Used by EventMapper and StateMachineFactory -->
 <!-- /** \example StateMachine.xml -->
 <!-- -->
 <!-- -->
 <!-- FAQ -->
 <!-- Question: the Application, that is loading this file doesn't act on the Interaction. Why? -->
 <!-- The QXMLFileLoader probably isn't able to load the file due to an error.-->
 <!-- Check the file for XML-Syntax like  "<" at beginning and "/>" at end -->
 
diff --git a/Core/Code/Interactions/mitkDisplayVectorInteractorLevelWindow.cpp b/Core/Code/Interactions/mitkDisplayVectorInteractorLevelWindow.cpp
index 1eaaa6ce09..d8b9523905 100644
--- a/Core/Code/Interactions/mitkDisplayVectorInteractorLevelWindow.cpp
+++ b/Core/Code/Interactions/mitkDisplayVectorInteractorLevelWindow.cpp
@@ -1,131 +1,131 @@
 /*===================================================================
 
 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 "mitkDisplayVectorInteractorLevelWindow.h"
 #include "mitkOperation.h"
 #include "mitkDisplayCoordinateOperation.h"
 #include "mitkStateEvent.h"
 #include "mitkInteractionConst.h"
 #include "mitkAction.h"
 #include "mitkStandaloneDataStorage.h"
 
 #include "mitkNodePredicateDataType.h"
 #include "mitkLevelWindowProperty.h"
 #include "mitkLevelWindow.h"
 
 
 void mitk::DisplayVectorInteractorLevelWindow::ExecuteOperation(Operation* itkNotUsed( operation ) )
 {
 }
 
 bool mitk::DisplayVectorInteractorLevelWindow::ExecuteAction(Action* action, mitk::StateEvent const* stateEvent)
 {
   bool ok=false;
   
   const DisplayPositionEvent* posEvent=dynamic_cast<const DisplayPositionEvent*>(stateEvent->GetEvent());
   if(posEvent==NULL) return false;
 
   int actionId = action->GetActionId();
   
   switch(actionId)
   {
   case AcINITMOVE:
     // MITK_INFO << "AcINITMOVE";
     {
       m_Sender=posEvent->GetSender();
       m_StartDisplayCoordinate=posEvent->GetDisplayPosition();
       m_LastDisplayCoordinate=posEvent->GetDisplayPosition();
       m_CurrentDisplayCoordinate=posEvent->GetDisplayPosition();
       ok = true;
       break;
     }
   case AcLEVELWINDOW:
     {
       m_LastDisplayCoordinate=m_CurrentDisplayCoordinate;
       m_CurrentDisplayCoordinate=posEvent->GetDisplayPosition();
   
       mitk::DataStorage::Pointer storage =  m_Sender->GetDataStorage();
       mitk::DataNode::Pointer node = NULL;
 
       mitk::DataStorage::SetOfObjects::ConstPointer allImageNodes = storage->GetSubset(mitk::NodePredicateDataType::New( "Image") );
 
       for ( unsigned int i = 0; i < allImageNodes->size() ; i++ )
       {
         bool isActiveImage = false;
         bool propFound = allImageNodes->at( i )->GetBoolProperty( "imageForLevelWindow", isActiveImage );
 
         if ( propFound && isActiveImage )
         { 
           node = allImageNodes->at( i );
           continue;
         }
       }
       if ( node.IsNull() )
       {
         node = storage->GetNode( mitk::NodePredicateDataType::New( "Image" ) );
       }
 
       if ( node.IsNull() )
       {
         return false;
       }
 
 
       mitk::LevelWindow lv = mitk::LevelWindow();
       node->GetLevelWindow(lv);
-      int level = lv.GetLevel();
-      int window = lv.GetWindow();
+      ScalarType level = lv.GetLevel();
+      ScalarType window = lv.GetWindow();
 
-      level += ( m_CurrentDisplayCoordinate[0] - m_LastDisplayCoordinate[0] )*2;
-      window += ( m_CurrentDisplayCoordinate[1] - m_LastDisplayCoordinate[1] )*2;
+      level += ( m_CurrentDisplayCoordinate[0] - m_LastDisplayCoordinate[0] )*static_cast<ScalarType>(2);
+      window += ( m_CurrentDisplayCoordinate[1] - m_LastDisplayCoordinate[1] )*static_cast<ScalarType>(2);
 
       lv.SetLevelWindow( level, window );
       dynamic_cast<mitk::LevelWindowProperty*>(node->GetProperty("levelwindow"))->SetLevelWindow( lv );
 
       m_Sender->GetRenderingManager()->RequestUpdateAll();
 
       ok = true;
       break;
     }
   case AcFINISHMOVE:
     // MITK_INFO << "AcFINISHMOVE";
     {
       ok = true;
       break;
     }
   default:
     ok = false;
     break;
   }
   return ok;
 }
 
 mitk::DisplayVectorInteractorLevelWindow::DisplayVectorInteractorLevelWindow(const char * type)
   : mitk::StateMachine(type), m_Sender(NULL)
 {
   m_StartDisplayCoordinate.Fill(0);
   m_LastDisplayCoordinate.Fill(0);
   m_CurrentDisplayCoordinate.Fill(0);
   m_UndoEnabled = false;
 
 }
 
 
 mitk::DisplayVectorInteractorLevelWindow::~DisplayVectorInteractorLevelWindow()
 {
 }
 
diff --git a/Core/Code/Interactions/mitkDisplayVectorInteractorScroll.cpp b/Core/Code/Interactions/mitkDisplayVectorInteractorScroll.cpp
index f876493942..0aee1898d8 100644
--- a/Core/Code/Interactions/mitkDisplayVectorInteractorScroll.cpp
+++ b/Core/Code/Interactions/mitkDisplayVectorInteractorScroll.cpp
@@ -1,224 +1,224 @@
 /*===================================================================
 
 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 "mitkDisplayVectorInteractorScroll.h"
 #include "mitkOperation.h"
 #include "mitkDisplayCoordinateOperation.h"
 //#include "mitkDisplayPositionEvent.h"
 #include "mitkUndoController.h"
 #include "mitkStateEvent.h"
 #include "mitkInteractionConst.h"
 #include "mitkAction.h"
 
 
 void mitk::DisplayVectorInteractorScroll::ExecuteOperation(Operation* itkNotUsed( operation ) )
 {
 }
 
 bool mitk::DisplayVectorInteractorScroll::ExecuteAction(Action* action, mitk::StateEvent const* stateEvent)
 {
   bool ok=false;
 
 
   const DisplayPositionEvent* posEvent=dynamic_cast<const DisplayPositionEvent*>(stateEvent->GetEvent());
 
   m_IsAltModifierActive = false;
 
   int actionId = action->GetActionId();
   
   switch(actionId)
   {
   case AcINITMOVE:
     {
       if(posEvent==NULL) return false;
 
       m_Sender=posEvent->GetSender();
       m_StartDisplayCoordinate=posEvent->GetDisplayPosition();
       m_LastDisplayCoordinate=posEvent->GetDisplayPosition();
       m_CurrentDisplayCoordinate=posEvent->GetDisplayPosition();
       ok = true;
       break;
     }
   case AcSCROLLMOUSEWHEEL:
     {
     const WheelEvent* wheelEvent=dynamic_cast<const WheelEvent*>(stateEvent->GetEvent());
 
     if(wheelEvent != NULL)
     {
       int buttonState = stateEvent->GetEvent()->GetButtonState();
       if(buttonState == 1024)
       {
         m_IsAltModifierActive = true;
       }
       mitk::SliceNavigationController::Pointer sliceNaviController = wheelEvent->GetSender()->GetSliceNavigationController();
 
       if ( !sliceNaviController->GetSliceLocked() )
       {
         this->InvokeEvent( StartScrollInteractionEvent() );
         mitk::Stepper* stepper = sliceNaviController->GetSlice();
 
         if (stepper->GetSteps() <= 1)
         {
           stepper = sliceNaviController->GetTime();
         }
 
         // get the desired delta
         int delta = wheelEvent->GetDelta();
         if ( m_InvertScrollingDirection )
           delta *= -1;  // If we want to invert the scrolling direction -> delta * -1
 
         if ( delta < 0 )
         {
           stepper->Next();
         }
         else
         {
           stepper->Previous();
         }
       }
       this->InvokeEvent( EndScrollInteractionEvent() );
     }
       ok = true;
       break;
     }
   case AcSCROLL:
   {
       if(posEvent==NULL) return false;
 
       int buttonState = stateEvent->GetEvent()->GetButtonState();
       //1025 = Alt+LeftMouseButton+Move
       //1028 = Alt+MiddleMouseButton+Move
       if(buttonState == 1025 || buttonState == 1028 )
       {
         m_IsAltModifierActive = true;
       }
 
       mitk::SliceNavigationController::Pointer sliceNaviController = m_Sender->GetSliceNavigationController();
 
       if(sliceNaviController)
       {
         this->InvokeEvent( StartScrollInteractionEvent() );
 
         int delta = 0;
 
-        delta = m_LastDisplayCoordinate[1]-posEvent->GetDisplayPosition()[1];
+        delta = static_cast<int>(m_LastDisplayCoordinate[1]-posEvent->GetDisplayPosition()[1]);
 
         // if we moved less than 'm_IndexToSliceModifier' pixels slice ONE slice only
         if ( delta>0 && delta<m_IndexToSliceModifier )
         {
           delta=m_IndexToSliceModifier;
         }
         else if(delta<0 && delta>-m_IndexToSliceModifier)
         {
           delta=-m_IndexToSliceModifier;
         }
 
         delta /= m_IndexToSliceModifier;
   
         if ( m_InvertScrollingDirection )
           delta *= -1;
 
         int newPos = sliceNaviController->GetSlice()->GetPos() + delta; 
 
         // if auto repeat is on, start at first slice if you reach the last slice and vice versa
         int maxSlices = sliceNaviController->GetSlice()->GetSteps();
         if ( m_AutoRepeat )
         {
           while(newPos<0)
           {
             newPos += maxSlices;
           }
 
           while(newPos>=maxSlices)
           {
             newPos -= maxSlices;
           }
         }
         else
         {
           // if the new slice is below 0 we still show slice 0
           // due to the stepper using unsigned int we have to do this ourselves
           if ( newPos < 1 )
             newPos = 0;
         }
 
         // set the new position
         sliceNaviController->GetSlice()->SetPos( newPos );
 
         this->InvokeEvent( EndScrollInteractionEvent() );
       }
 
       m_LastDisplayCoordinate=m_CurrentDisplayCoordinate;
       m_CurrentDisplayCoordinate=posEvent->GetDisplayPosition();
     }
   case AcFINISHMOVE:
     {
       ok = true;
       break;
     }
   default:
     ok = false;
     break;
   }
   return ok;
 }
 
 void mitk::DisplayVectorInteractorScroll::SetIndexToSliceModifier( int modifier )
 {
   m_IndexToSliceModifier = modifier;
 }
 
 void mitk::DisplayVectorInteractorScroll::SetAutoRepeat( bool autoRepeat )
 {
   m_AutoRepeat = autoRepeat;
 }
 
 mitk::DisplayVectorInteractorScroll::DisplayVectorInteractorScroll(const char * type, mitk::OperationActor* destination)
   : mitk::StateMachine(type)
   , m_Sender(NULL)
   , m_Destination(destination)
   , m_IndexToSliceModifier(4)
   , m_AutoRepeat( false )
   , m_InvertScrollingDirection( false )
   , m_IsAltModifierActive( false )
 {
   m_StartDisplayCoordinate.Fill(0);
   m_LastDisplayCoordinate.Fill(0);
   m_CurrentDisplayCoordinate.Fill(0);
   m_UndoEnabled = false;
 
   //if(m_Destination==NULL)
   //  m_Destination=this;
 }
 
 
 mitk::DisplayVectorInteractorScroll::~DisplayVectorInteractorScroll()
 {
   if ( m_Destination != this )
     delete m_Destination;
 }
 
 void mitk::DisplayVectorInteractorScroll::SetInvertScrollingDirection( bool invert )
 {
   m_InvertScrollingDirection = invert;
 }
 
 bool mitk::DisplayVectorInteractorScroll::IsAltModifierActive() const
 {
   return m_IsAltModifierActive;
 }
 
diff --git a/Core/Code/Interactions/mitkEventDescription.h b/Core/Code/Interactions/mitkEventDescription.h
index d5c6c685e3..2bdc9b8009 100644
--- a/Core/Code/Interactions/mitkEventDescription.h
+++ b/Core/Code/Interactions/mitkEventDescription.h
@@ -1,52 +1,60 @@
 /*===================================================================
 
 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 EVENTDESCRIPTION_H_HEADER_INCLUDED_C188FC4D
 #define EVENTDESCRIPTION_H_HEADER_INCLUDED_C188FC4D
 
 #include <MitkExports.h>
 #include "mitkEvent.h"
 #include <string>
 
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable: 4251)
+#endif
+
 namespace mitk {
 
   //##Documentation
   //## @brief adds additional Information (Name and EventID) to an Event
   //##
   //## A name and an ID is added to the information of an event, so the event can
   //## be processed futher on.
   //## @ingroup Interaction
   class MITK_CORE_EXPORT EventDescription : public Event
   {
   public:
     EventDescription(int type, int button, int buttonState,int key, std::string name, int id);
 
     std::string GetName() const;
 
     int GetId() const;
 
   private:
     std::string m_Name;
 
     int m_Id;
   };
 
 } // namespace mitk
 
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
 
 
 #endif /* EVENTDESCRIPTION_H_HEADER_INCLUDED_C188FC4D */
diff --git a/Core/Code/Interactions/mitkMouseModeSwitcher.cpp b/Core/Code/Interactions/mitkMouseModeSwitcher.cpp
index 129af20e14..8f9a101cda 100644
--- a/Core/Code/Interactions/mitkMouseModeSwitcher.cpp
+++ b/Core/Code/Interactions/mitkMouseModeSwitcher.cpp
@@ -1,205 +1,205 @@
 /*===================================================================
 
 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 "mitkMouseModeSwitcher.h"
 
 #include "mitkDisplayInteractor.h"
 #include "mitkDisplayVectorInteractor.h"
 #include "mitkDisplayVectorInteractorLevelWindow.h"
 #include "mitkDisplayVectorInteractorScroll.h"
 
 
 
 mitk::MouseModeSwitcher::MouseModeSwitcher( mitk::GlobalInteraction* gi ) 
 : m_GlobalInteraction( gi )
 , m_ActiveInteractionScheme( MITK )
 , m_ActiveMouseMode( MousePointer )
 , m_LeftMouseButtonHandler( NULL )
 {
   assert(gi);
 
   this->InitializeListeners();
   this->SetInteractionScheme( m_ActiveInteractionScheme );
 }
 
 
 mitk::MouseModeSwitcher::~MouseModeSwitcher()
 {
 }
 
 
 void mitk::MouseModeSwitcher::InitializeListeners()
 {
   mitk::DisplayVectorInteractor::Pointer moveAndZoomInteractor = mitk::DisplayVectorInteractor::New(
     "moveNzoom", new mitk::DisplayInteractor() );
   mitk::StateMachine::Pointer listener = moveAndZoomInteractor.GetPointer();
   m_ListenersForMITK.push_back( listener );
 
 /* Trac 1366 - temporarily turn these off 
 
   mitk::DisplayVectorInteractorScroll::Pointer scrollInteractor = mitk::DisplayVectorInteractorScroll::New( 
-    "MiddleClickScroll", new mitk::DisplayInteractor() );
+    "alternativeScroll", new mitk::DisplayInteractor() );
   listener = scrollInteractor;
   m_ListenersForPACS.push_back( listener );
 
-  mitk::DisplayVectorInteractorLevelWindow::Pointer lwInteractor = mitk::DisplayVectorInteractorLevelWindow::New("RightClickLevelWindow");
+  mitk::DisplayVectorInteractorLevelWindow::Pointer lwInteractor = mitk::DisplayVectorInteractorLevelWindow::New("alternativeLevelWindow");
   listener = lwInteractor;
   m_ListenersForPACS.push_back( listener );
 
   mitk::DisplayVectorInteractor::Pointer panInteractor = mitk::DisplayVectorInteractor::New( 
-    "ShiftClickPan", new mitk::DisplayInteractor() );
+    "alternativePan", new mitk::DisplayInteractor() );
   listener = panInteractor;
   m_ListenersForPACS.push_back( listener );
 
   mitk::DisplayVectorInteractor::Pointer crtlZoomInteractor = mitk::DisplayVectorInteractor::New( 
-    "CtrlZoom", new mitk::DisplayInteractor() );
+    "alternativeZoom", new mitk::DisplayInteractor() );
   listener = crtlZoomInteractor;
   m_ListenersForPACS.push_back( listener );
 
  **** Trac 1366 - temporarily turn these off. */
 }
 
 void mitk::MouseModeSwitcher::SetInteractionScheme( InteractionScheme scheme )
 {
 
   switch ( scheme )
   {
   case MITK :
     {
       ListenerList::iterator iter;
       for ( iter=m_ListenersForPACS.begin(); iter!=m_ListenersForPACS.end(); iter++ )
       {
         m_GlobalInteraction->RemoveListener( (*iter) );
       }
 
       for ( iter=m_ListenersForMITK.begin(); iter!=m_ListenersForMITK.end(); iter++ )
       {
         m_GlobalInteraction->AddListener( (*iter) );
       }
       break;
     } // case MITK
   case PACS :
     {
       ListenerList::iterator iter;
       for ( iter=m_ListenersForMITK.begin(); iter!=m_ListenersForMITK.end(); iter++ )
       {
         m_GlobalInteraction->RemoveListener( (*iter) );
       }
 
       for ( iter=m_ListenersForPACS.begin(); iter!=m_ListenersForPACS.end(); iter++ )
       {
         m_GlobalInteraction->AddListener( (*iter) );
       }
 
       this->SelectMouseMode( MousePointer );
       break;
     } // case PACS
   case OFF:
     {
       ListenerList::iterator iter;
       for ( iter=m_ListenersForMITK.begin(); iter!=m_ListenersForMITK.end(); iter++ )
       {
         m_GlobalInteraction->RemoveListener( (*iter) );
       }
       for ( iter=m_ListenersForPACS.begin(); iter!=m_ListenersForPACS.end(); iter++ )
       {
         m_GlobalInteraction->RemoveListener( (*iter) );
       }
       break;
     } // case OFF
   } // switch
 
 
   m_ActiveInteractionScheme = scheme;
 }
 
 void mitk::MouseModeSwitcher::SelectMouseMode( MouseMode mode )
 {
   if ( m_ActiveInteractionScheme != PACS )
     return;
 
   switch ( mode )
   {
   case MousePointer :
     {
       m_GlobalInteraction->RemoveListener( m_LeftMouseButtonHandler );
       break;
     } // case 0
   case Scroll :
     {
       m_GlobalInteraction->RemoveListener( m_LeftMouseButtonHandler );
 
       mitk::DisplayVectorInteractorScroll::Pointer scrollInteractor = mitk::DisplayVectorInteractorScroll::New( 
-        "LeftClickScroll", new mitk::DisplayInteractor() );
+        "Scroll", new mitk::DisplayInteractor() );
       m_LeftMouseButtonHandler = scrollInteractor;
 
       m_GlobalInteraction->AddListener( m_LeftMouseButtonHandler );
 
       break;
     } // case 1
   case LevelWindow :
     {
       m_GlobalInteraction->RemoveListener( m_LeftMouseButtonHandler );
 
       mitk::DisplayVectorInteractorLevelWindow::Pointer lwInteractor = mitk::DisplayVectorInteractorLevelWindow::New( 
-        "LeftClickLevelWindow" );
+        "LevelWindow" );
       m_LeftMouseButtonHandler = lwInteractor;
 
       m_GlobalInteraction->AddListener( m_LeftMouseButtonHandler );
 
       break;
     } // case 2
   case Zoom :
     {
       m_GlobalInteraction->RemoveListener( m_LeftMouseButtonHandler );
 
       mitk::DisplayVectorInteractor::Pointer zoomInteractor = mitk::DisplayVectorInteractor::New( 
         "Zoom", new mitk::DisplayInteractor() );
       m_LeftMouseButtonHandler = zoomInteractor;
 
       m_GlobalInteraction->AddListener( m_LeftMouseButtonHandler );
 
       break;
     } // case 3
   case Pan :
     {
       m_GlobalInteraction->RemoveListener( m_LeftMouseButtonHandler );
 
       mitk::DisplayVectorInteractor::Pointer panInteractor = mitk::DisplayVectorInteractor::New( 
         "Pan", new mitk::DisplayInteractor() );
       m_LeftMouseButtonHandler = panInteractor;
 
       m_GlobalInteraction->AddListener( m_LeftMouseButtonHandler );
 
       break;
     } // case 4
 
   } // switch (mode)
 
   m_ActiveMouseMode = mode;
 
   this->InvokeEvent( MouseModeChangedEvent() );
 
 }
 
 
 mitk::MouseModeSwitcher::MouseMode mitk::MouseModeSwitcher::GetCurrentMouseMode() const
 {
   return m_ActiveMouseMode;
 }
 
 
diff --git a/Core/Code/Rendering/vtkMitkThickSlicesFilter.cpp b/Core/Code/Rendering/vtkMitkThickSlicesFilter.cpp
index ef8f746ead..1d12aa7a8f 100644
--- a/Core/Code/Rendering/vtkMitkThickSlicesFilter.cpp
+++ b/Core/Code/Rendering/vtkMitkThickSlicesFilter.cpp
@@ -1,373 +1,373 @@
 /*===================================================================
 
 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 "vtkMitkThickSlicesFilter.h"
 
 #include "vtkDataArray.h"
 #include "vtkImageData.h"
 #include "vtkInformation.h"
 #include "vtkInformationVector.h"
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
 #include <math.h>
 #include <vtksys/ios/sstream>
 
 vtkCxxRevisionMacro(vtkMitkThickSlicesFilter, "$Revision: 1.00 $");
 vtkStandardNewMacro(vtkMitkThickSlicesFilter);
 
 //----------------------------------------------------------------------------
 // Construct an instance of vtkMitkThickSlicesFilter fitler.
 vtkMitkThickSlicesFilter::vtkMitkThickSlicesFilter()
 {
   this->HandleBoundaries = 1;
   this->Dimensionality = 2;
   
   this->m_CurrentMode = MIP;
   
   // by default process active point scalars
   this->SetInputArrayToProcess(0,0,0,vtkDataObject::FIELD_ASSOCIATION_POINTS,
                                vtkDataSetAttributes::SCALARS);  
 }
 
 //----------------------------------------------------------------------------
 void vtkMitkThickSlicesFilter::PrintSelf(ostream& os, vtkIndent indent)
 {
   this->Superclass::PrintSelf(os, indent);
   os << indent << "HandleBoundaries: " << this->HandleBoundaries << "\n";
   os << indent << "Dimensionality: " << this->Dimensionality << "\n";
 }
 
 //----------------------------------------------------------------------------
 int vtkMitkThickSlicesFilter::RequestInformation(vtkInformation*,
                                          vtkInformationVector** inputVector,
                                          vtkInformationVector* outputVector)
 {
   // Get input and output pipeline information.
   vtkInformation* outInfo = outputVector->GetInformationObject(0);
   vtkInformation* inInfo = inputVector[0]->GetInformationObject(0);
 
   // Get the input whole extent.
   int extent[6];
   inInfo->Get(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT(), extent);
 
   // Reduce 3D to 2D output
   extent[4] = extent[5] = 0;
 
   // Store the new whole extent for the output.
   outInfo->Set(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT(), extent, 6);
 
 /*
   // Set the number of point data componets to the number of
   // components in the gradient vector.
   vtkDataObject::SetPointDataActiveScalarInfo(outInfo, VTK_DOUBLE,
                                               this->Dimensionality);
   */
   return 1;
 }
 
 //----------------------------------------------------------------------------
 // This method computes the input extent necessary to generate the output.
 int vtkMitkThickSlicesFilter::RequestUpdateExtent(vtkInformation*,
                                           vtkInformationVector** inputVector,
                                           vtkInformationVector* outputVector)
 {
   // Get input and output pipeline information.
   vtkInformation* outInfo = outputVector->GetInformationObject(0);
   vtkInformation* inInfo = inputVector[0]->GetInformationObject(0);
 
   // Get the input whole extent.
   int wholeExtent[6];
   inInfo->Get(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT(), wholeExtent);
 
   // Get the requested update extent from the output.
   int inUExt[6];
   outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_EXTENT(), inUExt);
 
   /*inUExt[4] -= 5;
   inUExt[5] += 5;
 
   if (inUExt[4] < wholeExtent[4]) */inUExt[4] = wholeExtent[4];
   /*if (inUExt[5] > wholeExtent[5]) */inUExt[5] = wholeExtent[5];
   
   // Store the update extent needed from the intput.
   inInfo->Set(vtkStreamingDemandDrivenPipeline::UPDATE_EXTENT(), inUExt, 6);
 
   return 1;
 }
 
 //----------------------------------------------------------------------------
 // This execute method handles boundaries.
 // it handles boundaries. Pixels are just replicated to get values
 // out of extent.
 template <class T>
 void vtkMitkThickSlicesFilterExecute(vtkMitkThickSlicesFilter *self,
                              vtkImageData *inData, T *inPtr,
                              vtkImageData *outData, T *outPtr,
                              int outExt[6], int /*id*/)
 {
   int idxX, idxY;
   int maxX, maxY;
   vtkIdType inIncX, inIncY, inIncZ;
   vtkIdType outIncX, outIncY, outIncZ;
   //int axesNum;
   int *inExt = inData->GetExtent();
   int *wholeExtent;
   vtkIdType *inIncs;
   //int useYMin, useYMax, useXMin, useXMax;
 
   // find the region to loop over
   maxX = outExt[1] - outExt[0];
   maxY = outExt[3] - outExt[2];
 
 //  maxZ = outExt[5] - outExt[4];
 
   // Get the dimensionality of the gradient.
   //axesNum = self->GetDimensionality();
 
   // Get increments to march through data
   inData->GetContinuousIncrements(outExt, inIncX, inIncY, inIncZ);
   outData->GetContinuousIncrements(outExt, outIncX, outIncY, outIncZ);
                    /*
   // The data spacing is important for computing the gradient.
   // central differences (2 * ratio).
   // Negative because below we have (min - max) for dx ...
   inData->GetSpacing(r);
   r[0] = -0.5 / r[0];
   r[1] = -0.5 / r[1];
   r[2] = -0.5 / r[2];
                      */
   // get some other info we need
   inIncs = inData->GetIncrements();
   wholeExtent = inData->GetExtent();
 
   // Move the pointer to the correct starting position.
   inPtr += (outExt[0]-inExt[0])*inIncs[0] +
            (outExt[2]-inExt[2])*inIncs[1] +
            (outExt[4]-inExt[4])*inIncs[2];
 
   // Loop through ouput pixels
 
   int _minZ = /*-5 + outExt[4];  if( _minZ  < wholeExtent[4]) _minZ=*/wholeExtent[4];
   int _maxZ = /* 5 + outExt[4];  if( _maxZ  > wholeExtent[5]) _maxZ=*/wholeExtent[5];
 
   if(_maxZ<_minZ)
     return;
   
   double invNum = 1.0 / (_maxZ-_minZ+1) ;
 
   
   switch(self->GetThickSliceMode())
   {
     default:
     case vtkMitkThickSlicesFilter::MIP:
       {
         //MIP
         for (idxY = 0; idxY <= maxY; idxY++)
         {
           //useYMin = ((idxY + outExt[2]) <= wholeExtent[2]) ? 0 : -inIncs[1];
           //useYMax = ((idxY + outExt[2]) >= wholeExtent[3]) ? 0 : inIncs[1];
           for (idxX = 0; idxX <= maxX; idxX++)
           {
             //useXMin = ((idxX + outExt[0]) <= wholeExtent[0]) ? 0 : -inIncs[0];
             //useXMax = ((idxX + outExt[0]) >= wholeExtent[1]) ? 0 : inIncs[0];
 
             T mip = inPtr[_minZ*inIncs[2]];
             
             for(int z = _minZ+1; z<= _maxZ;z++)
             {
               T value = inPtr[z*inIncs[2]];
               if(value > mip)
                 mip=value;
             }
 
             // do X axis
             *outPtr = mip;
             outPtr++;
             inPtr++;
           }
           outPtr += outIncY;
           inPtr += inIncY;
         }
       }
       break;
       
     case vtkMitkThickSlicesFilter::SUM:
       {
         //MIP
         for (idxY = 0; idxY <= maxY; idxY++)
         {
           //useYMin = ((idxY + outExt[2]) <= wholeExtent[2]) ? 0 : -inIncs[1];
           //useYMax = ((idxY + outExt[2]) >= wholeExtent[3]) ? 0 : inIncs[1];
           for (idxX = 0; idxX <= maxX; idxX++)
           {
             //useXMin = ((idxX + outExt[0]) <= wholeExtent[0]) ? 0 : -inIncs[0];
             //useXMax = ((idxX + outExt[0]) >= wholeExtent[1]) ? 0 : inIncs[0];
 
             double sum = 0;
             
             for(int z = _minZ; z<= _maxZ;z++)
             {
               T value = inPtr[z*inIncs[2]];
               sum += value;
             }
 
             // do X axis
-            *outPtr = invNum*sum;
+            *outPtr = static_cast<T>(invNum*sum);
             outPtr++;
             inPtr++;
           }
           outPtr += outIncY;
           inPtr += inIncY;
         }
       }
       break;
 
   case vtkMitkThickSlicesFilter::WEIGHTED:
     {
       const int size = _maxZ-_minZ;
       std::vector<double> weights(size);
       double mean = 0.5 * double(_minZ + _maxZ);
       double sigma_sq = double(size) / 6.0;
       sigma_sq *= sigma_sq;
       double sum = 0;
       int i=0;
       for(int z = _minZ+1; z<= _maxZ;z++)
       {
         double val = exp(-(((double)z-mean)/sigma_sq));
         weights[i++] = val;
         sum += val;
       }
       for(i=0; i<size; i++)
       {
         weights[i] /= sum;
       }
 
       for (idxY = 0; idxY <= maxY; idxY++)
       {
         //useYMin = ((idxY + outExt[2]) <= wholeExtent[2]) ? 0 : -inIncs[1];
         //useYMax = ((idxY + outExt[2]) >= wholeExtent[3]) ? 0 : inIncs[1];
         for (idxX = 0; idxX <= maxX; idxX++)
         {
           //useXMin = ((idxX + outExt[0]) <= wholeExtent[0]) ? 0 : -inIncs[0];
           //useXMax = ((idxX + outExt[0]) >= wholeExtent[1]) ? 0 : inIncs[0];
 
           T mip = inPtr[_minZ*inIncs[2]];
           i=0;
           double mymip = 0;
           for(int z = _minZ+1; z<= _maxZ;z++)
           {
             double value = inPtr[z*inIncs[2]];
             mymip+=value*weights[i++];
           }
-          mip = mymip;
+          mip = static_cast<T>(mymip);
           // do X axis
           *outPtr = mip;
           outPtr++;
           inPtr++;
         }
         outPtr += outIncY;
         inPtr += inIncY;
       }
     }
     break;
   }
   
 }
 
 int vtkMitkThickSlicesFilter::RequestData(
   vtkInformation* request,
   vtkInformationVector** inputVector,
   vtkInformationVector* outputVector)
 {
   if (!this->Superclass::RequestData(request, inputVector, outputVector))
     {
     return 0;
     }
   vtkImageData* output = vtkImageData::GetData(outputVector);
   vtkDataArray* outArray = output->GetPointData()->GetScalars();
   vtksys_ios::ostringstream newname;
   newname << (outArray->GetName()?outArray->GetName():"")
     << "Gradient";
   outArray->SetName(newname.str().c_str());
   // Why not pass the original array?
   if (this->GetInputArrayToProcess(0, inputVector))
     {
     output->GetPointData()->AddArray(
         this->GetInputArrayToProcess(0, inputVector));
     }
   return 1;
 }
 
 //----------------------------------------------------------------------------
 // This method contains a switch statement that calls the correct
 // templated function for the input data type.  This method does handle
 // boundary conditions.
 void vtkMitkThickSlicesFilter::ThreadedRequestData(vtkInformation*,
                                            vtkInformationVector** inputVector,
                                            vtkInformationVector*,
                                            vtkImageData*** inData,
                                            vtkImageData** outData,
                                            int outExt[6],
                                            int threadId)
 {
   // Get the input and output data objects.
   vtkImageData* input = inData[0][0];
   vtkImageData* output = outData[0];
 
   // The ouptut scalar type must be double to store proper gradients.
 /*
   if(output->GetScalarType() != VTK_DOUBLE)
     {
     vtkErrorMacro("Execute: output ScalarType is "
                   << output->GetScalarType() << "but must be double.");
     return;
     }
   */
   vtkDataArray* inputArray = this->GetInputArrayToProcess(0, inputVector);
   if (!inputArray)
     {
     vtkErrorMacro("No input array was found. Cannot execute");
     return;
     }
 
   // Gradient makes sense only with one input component.  This is not
   // a Jacobian filter.
   if(inputArray->GetNumberOfComponents() != 1)
     {
     vtkErrorMacro(
       "Execute: input has more than one component. "
       "The input to gradient should be a single component image. "
       "Think about it. If you insist on using a color image then "
       "run it though RGBToHSV then ExtractComponents to get the V "
       "components. That's probably what you want anyhow.");
     return;
     }
 
   void* inPtr = inputArray->GetVoidPointer(0);
   void* outPtr = output->GetScalarPointerForExtent(outExt);
 
   switch(inputArray->GetDataType())
     {
     vtkTemplateMacro(
       vtkMitkThickSlicesFilterExecute(this, input, static_cast<VTK_TT*>(inPtr), output, static_cast<VTK_TT*>(outPtr), outExt, threadId)
       );
     default:
       vtkErrorMacro("Execute: Unknown ScalarType " << input->GetScalarType());
       return;
     }
 }
diff --git a/Core/Code/Testing/mitkExtractSliceFilterTest.cpp b/Core/Code/Testing/mitkExtractSliceFilterTest.cpp
index 0d6067d787..58142d5a83 100644
--- a/Core/Code/Testing/mitkExtractSliceFilterTest.cpp
+++ b/Core/Code/Testing/mitkExtractSliceFilterTest.cpp
@@ -1,1161 +1,1160 @@
-/*=========================================================================
+/*===================================================================
 
-Program:   Medical Imaging & Interaction Toolkit
-Language:  C++
-Date:      $Date$
-Version:   $Revision: 7837 $
+The Medical Imaging Interaction Toolkit (MITK)
 
-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.
+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 the above copyright notices for more information.
+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 <mitkExtractSliceFilter.h>
 #include <mitkTestingMacros.h>
 #include <mitkItkImageFileReader.h>
 #include <itkImageRegionIterator.h>
 #include <mitkImageCast.h>
 #include <itkImage.h>
 #include <mitkImageAccessByItk.h>
 #include <mitkStandardFileLocations.h>
 #include <mitkImageWriter.h>
 #include <mitkITKImageImport.h>
 #include <mitkRotationOperation.h>
 #include <mitkInteractionConst.h>
 #include <mitkVector.h>
 
 #include <ctime> 
 #include <cstdlib>
 #include <math.h>
 
 
 #include <mitkGeometry3D.h>
 
 #include <vtkImageData.h>
 #include <vtkSmartPointer.h>
 #include <vtkActor.h>
 #include <vtkRenderWindowInteractor.h>
 #include <vtkRenderWindow.h>
 #include <vtkInteractorStyleImage.h>
 #include <vtkRenderer.h>
 #include <vtkImageMapper.h>
 #include <vtkImageReslice.h>
 #include <vtkImageActor.h>
 #include <vtkImageMapToColors.h>
 #include <vtkLookupTable.h>
 #include <vtkTexture.h>
 #include <vtkPolyDataMapper.h>
 #include <vtkPlaneSource.h>
 
 
 //use this to create the test volume on the fly
 #define CREATE_VOLUME
 
 //use this to save the created volume
 //#define SAVE_VOLUME
 
 //use this to calculate the error from the sphere mathematical model to our pixel based one
 //#define CALC_TESTFAILURE_DEVIATION
 
 //use this to render an oblique slice through a specified image
 //#define SHOW_SLICE_IN_RENDER_WINDOW
 
 //use this to have infos printed in mbilog
 //#define EXTRACTOR_DEBUG
 
 
 /*these are the deviations calculated by the function CalcTestFailureDeviation (see for details)*/
 #define Testfailure_Deviation_Mean_128 0.853842
 
 #define Testfailure_Deviation_Volume_128 0.145184
 #define Testfailure_Deviation_Diameter_128 1.5625
 
 
 
 #define Testfailure_Deviation_Mean_256 0.397693
 
 #define Testfailure_Deviation_Volume_256 0.0141357
 #define Testfailure_Deviation_Diameter_256 0.78125
 
 
 
 #define Testfailure_Deviation_Mean_512 0.205277
 
 #define Testfailure_Deviation_Volume_512 0.01993
 #define Testfailure_Deviation_Diameter_512 0.390625
 
 
 
 class mitkExtractSliceFilterTestClass{
 
 public:
 
 
   static void TestSlice(mitk::PlaneGeometry* planeGeometry, std::string testname)
   {
     TestPlane = planeGeometry;
     TestName = testname;
     
     float centerCoordValue = TestvolumeSize / 2.0;
     float center[3] = {centerCoordValue, centerCoordValue, centerCoordValue};
     mitk::Point3D centerIndex(center);
 
     double radius = TestvolumeSize / 4.0;
     if(TestPlane->Distance(centerIndex) >= radius ) return;//outside sphere
     
 
 
     //feed ExtractSliceFilter
     mitk::ExtractSliceFilter::Pointer slicer = mitk::ExtractSliceFilter::New();
 
     slicer->SetInput(TestVolume);
     slicer->SetWorldGeometry(TestPlane);
     slicer->Update();
 
     MITK_TEST_CONDITION_REQUIRED(slicer->GetOutput() != NULL, "Extractor returned a slice");
 
     mitk::Image::Pointer reslicedImage = slicer->GetOutput();
 
     AccessFixedDimensionByItk(reslicedImage, TestSphereRadiusByItk, 2);
     AccessFixedDimensionByItk(reslicedImage, TestSphereAreaByItk, 2);
 
     double devArea, devDiameter;
     if(TestvolumeSize == 128.0){ devArea = Testfailure_Deviation_Volume_128; devDiameter = Testfailure_Deviation_Diameter_128; }
     else if(TestvolumeSize == 256.0){devArea = Testfailure_Deviation_Volume_256; devDiameter = Testfailure_Deviation_Diameter_256;}
     else if (TestvolumeSize == 512.0){devArea = Testfailure_Deviation_Volume_512; devDiameter = Testfailure_Deviation_Diameter_512;}
     else{devArea = Testfailure_Deviation_Volume_128; devDiameter = Testfailure_Deviation_Diameter_128;}
   
 
     std::string areatestName = TestName.append(" area");
     std::string diametertestName = TestName.append(" testing diameter");
 
     //TODO think about the deviation, 1% makes no sense at all
     MITK_TEST_CONDITION(std::abs(100 - testResults.percentageAreaCalcToPixel) < 1, areatestName );
     MITK_TEST_CONDITION(std::abs(100 - testResults.percentageRadiusToPixel) < 1, diametertestName );
   
   #ifdef EXTRACTOR_DEBUG
     MITK_INFO << TestName << " >>> " << "planeDistanceToSphereCenter: " << testResults.planeDistanceToSphereCenter;
     MITK_INFO << "area in pixels: " << testResults.areaInPixel << " <-> area in mm: " << testResults.areaCalculated << " = " << testResults.percentageAreaCalcToPixel << "%";
     
     MITK_INFO << "calculated diameter: " << testResults.diameterCalculated << " <-> diameter in mm: " << testResults.diameterInMM << " <-> diameter in pixel: " << testResults.diameterInPixel << " = " << testResults.percentageRadiusToPixel << "%";
   #endif 
   }
 
 
   /*
    * get the radius of the slice of a sphere based on pixel distance from edge to edge of the circle. 
    */
   template<typename TPixel, unsigned int VImageDimension>
   static void TestSphereRadiusByItk (itk::Image<TPixel, VImageDimension>* inputImage)
   {
     typedef itk::Image<TPixel, VImageDimension> InputImageType;
     
 
     //set the index to the middle of the image's edge at x and y axis
     typename InputImageType::IndexType currentIndexX;
     currentIndexX[0] = (int)(TestvolumeSize / 2.0);
     currentIndexX[1] = 0;
 
     typename InputImageType::IndexType currentIndexY;
     currentIndexY[0] = 0;
     currentIndexY[1] = (int)(TestvolumeSize / 2.0);
 
 
     //remember the last pixel value
     double lastValueX = inputImage->GetPixel(currentIndexX);
     double lastValueY = inputImage->GetPixel(currentIndexY);
 
 
     //storage for the index marks
                 std::vector<typename InputImageType::IndexType> indicesX;
                 std::vector<typename InputImageType::IndexType> indicesY;
 
 
     /*Get four indices on the edge of the circle*/
     while(currentIndexX[1] < TestvolumeSize && currentIndexX[0] < TestvolumeSize)
     {
       //move x direction
       currentIndexX[1] += 1;
 
       //move y direction
       currentIndexY[0] += 1;
 
       if(inputImage->GetPixel(currentIndexX) > lastValueX)
       {
         //mark the current index
         typename InputImageType::IndexType markIndex;
         markIndex[0] = currentIndexX[0];
         markIndex[1] = currentIndexX[1];
 
 
         indicesX.push_back(markIndex);
       }
       else if( inputImage->GetPixel(currentIndexX) < lastValueX)
       {
         //mark the current index
         typename InputImageType::IndexType markIndex;
         markIndex[0] = currentIndexX[0];
         markIndex[1] = currentIndexX[1] - 1;//value inside the sphere
 
 
         indicesX.push_back(markIndex);
       }
 
       if(inputImage->GetPixel(currentIndexY) > lastValueY)
       {
         //mark the current index
         typename InputImageType::IndexType markIndex;
         markIndex[0] = currentIndexY[0];
         markIndex[1] = currentIndexY[1];
 
 
         indicesY.push_back(markIndex);
       }
       else if( inputImage->GetPixel(currentIndexY) < lastValueY)
       {
         //mark the current index
         typename InputImageType::IndexType markIndex;
         markIndex[0] = currentIndexY[0];
         markIndex[1] = currentIndexY[1] - 1;//value inside the sphere
 
 
         indicesY.push_back(markIndex);
       }
 
 
       //found both marks?
       if(indicesX.size() == 2 && indicesY.size() == 2) break;
       
       //the new 'last' values
       lastValueX = inputImage->GetPixel(currentIndexX);
       lastValueY = inputImage->GetPixel(currentIndexY);
     }
 
     /*
      *If we are here we found the four marks on the edge of the circle.
      *For the case our plane is rotated and shifted, we have to calculate the center of the circle,
      *else the center is the intersection of both straight lines between the marks.
      *When we have the center, the diameter of the circle will be checked to the reference value(math!).
      */
 
     //each distance from the first mark of each direction to the center of the straight line between the marks 
     double distanceToCenterX = std::abs(indicesX[0][1] - indicesX[1][1]) / 2.0;
     double distanceToCenterY = std::abs(indicesY[0][0] - indicesY[1][0]) / 2.0;
 
 
     //the center of the straight lines
     typename InputImageType::IndexType centerX, centerY;
 
     centerX[0] = indicesX[0][0];
     centerX[1] = indicesX[0][1] + distanceToCenterX;
     //TODO think about implicit cast to int. this is not the real center of the image, which could be between two pixels
 
     //centerY[0] = indicesY[0][0] + distanceToCenterY;
     //centerY[1] = inidcesY[0][1];
 
     typename InputImageType::IndexType currentIndex(centerX);
     lastValueX = inputImage->GetPixel(currentIndex);
 
     long sumpixels = 0;
 
                 std::vector<typename InputImageType::IndexType> diameterIndices;
 
     //move up
     while(currentIndex[1] < TestvolumeSize)
     {
       currentIndex[1] += 1;
 
       if( inputImage->GetPixel(currentIndex) != lastValueX)
       { 
         typename InputImageType::IndexType markIndex;
         markIndex[0] = currentIndex[0];
         markIndex[1] = currentIndex[1] - 1; 
         
         diameterIndices.push_back(markIndex); 
         break;
       }
 
       sumpixels++;
       lastValueX = inputImage->GetPixel(currentIndex);
     }
     
     currentIndex[1] -= sumpixels; //move back to center to go in the other direction
     lastValueX = inputImage->GetPixel(currentIndex);
 
     //move down
     while(currentIndex[1] >= 0)
     {
       currentIndex[1] -= 1;
 
       if( inputImage->GetPixel(currentIndex) != lastValueX)
         { 
         typename InputImageType::IndexType markIndex;
         markIndex[0] = currentIndex[0];
         markIndex[1] = currentIndex[1];//outside sphere because we want to calculate the distance from edge to edge 
         
         diameterIndices.push_back(markIndex); 
         break;
       }
       
       sumpixels++;
       lastValueX = inputImage->GetPixel(currentIndex);
     }
 
     
 
     /*
     *Now sumpixels should be the apromximate diameter of the circle. This is checked with the calculated diameter from the plane transformation(math).
     */
     mitk::Point3D volumeCenter;
     volumeCenter[0] = volumeCenter[1] = volumeCenter[2] = TestvolumeSize / 2.0;
 
     
     double planeDistanceToSphereCenter = TestPlane->Distance(volumeCenter);
 
 
     double sphereRadius = TestvolumeSize/4.0;
 
     //calculate the radius of the circle cut from the sphere by the plane
     double diameter = 2.0 * std::sqrt(std::pow(sphereRadius, 2) - std::pow( planeDistanceToSphereCenter  , 2));
 
     double percentageRadiusToPixel = 100 /  diameter  * sumpixels;
     
     
 
     /*
      *calculate the radius in mm by the both marks of the center line by using the world coordinates
      */
     //get the points as 3D coordinates
     mitk::Vector3D diameterPointRight, diameterPointLeft;
 
     diameterPointRight[2] = diameterPointLeft[2] = 0.0;
     
     diameterPointLeft[0] = diameterIndices[0][0];
     diameterPointLeft[1] = diameterIndices[0][1];
 
     diameterPointRight[0] = diameterIndices[1][0];
     diameterPointRight[1] = diameterIndices[1][1];
 
     //transform to worldcoordinates
     TestVolume->GetGeometry()->IndexToWorld(diameterPointLeft, diameterPointLeft);
     TestVolume->GetGeometry()->IndexToWorld(diameterPointRight, diameterPointRight);
 
     //euklidian distance
     double diameterInMM = ( (diameterPointLeft * -1.0) + diameterPointRight).GetNorm();
 
 
     testResults.diameterInMM = diameterInMM;
     testResults.diameterCalculated = diameter;
     testResults.diameterInPixel = sumpixels;
     testResults.percentageRadiusToPixel = percentageRadiusToPixel;
     testResults.planeDistanceToSphereCenter = planeDistanceToSphereCenter;
   }
 
 
 
 
 
   /*brute force the area pixel by pixel*/
   template<typename TPixel, unsigned int VImageDimension>
   static void TestSphereAreaByItk (itk::Image<TPixel, VImageDimension>* inputImage)
   {
     typedef itk::Image<TPixel, VImageDimension> InputImageType;
     typedef itk::ImageRegionConstIterator< InputImageType > ImageIterator;
 
 
     ImageIterator imageIterator( inputImage, inputImage->GetLargestPossibleRegion() );
     imageIterator.GoToBegin();
 
     int sumPixelsInArea = 0;
 
     while( !imageIterator.IsAtEnd() )
     {
       if(inputImage->GetPixel(imageIterator.GetIndex()) == pixelValueSet) sumPixelsInArea++;
       ++imageIterator;
     }
     
     mitk::Point3D volumeCenter;
     volumeCenter[0] = volumeCenter[1] = volumeCenter[2] = TestvolumeSize / 2.0;
 
     
     double planeDistanceToSphereCenter = TestPlane->Distance(volumeCenter);
 
     double sphereRadius = TestvolumeSize/4.0;
 
     //calculate the radius of the circle cut from the sphere by the plane
     double radius = std::sqrt(std::pow(sphereRadius, 2) - std::pow( planeDistanceToSphereCenter  , 2));
 
     double areaInMM = 3.14159265358979 * std::pow(radius, 2);
     
 
     testResults.areaCalculated = areaInMM;
     testResults.areaInPixel = sumPixelsInArea;
     testResults.percentageAreaCalcToPixel = 100 / areaInMM * sumPixelsInArea;
   }
 
 
 
   /* 
    * random a voxel. define plane through this voxel. reslice at the plane. compare the pixel vaues of the voxel
    * in the volume with the pixel value in the resliced image.
    * there are some indice shifting problems which causes the test to fail for oblique planes. seems like the chosen
    * worldcoordinate is not corrresponding to the index in the 2D image. and so the pixel values are not the same as
    * expected.
    */
   static void PixelvalueBasedTest()
   {
     /* setup itk image */
     typedef itk::Image<unsigned short, 3> ImageType;
 
     typedef itk::ImageRegionConstIterator< ImageType > ImageIterator;
 
     ImageType::Pointer image = ImageType::New();
 
     ImageType::IndexType start;
     start[0] = start[1] = start[2] = 0;
 
     ImageType::SizeType size;
     size[0] = size[1] = size[2] = 32;
 
     ImageType::RegionType imgRegion;
     imgRegion.SetSize(size);
     imgRegion.SetIndex(start);
 
     image->SetRegions(imgRegion);
     image->SetSpacing(1.0);
     image->Allocate();
 
 
     ImageIterator imageIterator( image, image->GetLargestPossibleRegion() );
     imageIterator.GoToBegin();
 
     
     unsigned short pixelValue = 0;
     
     //fill the image with distinct values
     while ( !imageIterator.IsAtEnd() )
     {
       image->SetPixel(imageIterator.GetIndex(), pixelValue);
       ++imageIterator;
       ++pixelValue;
     }
     /* end setup itk image */
 
 
     
     mitk::Image::Pointer imageInMitk;
     CastToMitkImage(image, imageInMitk);
     
 
 
     /*mitk::ImageWriter::Pointer writer = mitk::ImageWriter::New();
     writer->SetInput(imageInMitk);
     std::string file = "C:\\Users\\schroedt\\Desktop\\cube.nrrd";
     writer->SetFileName(file);
     writer->Update();*/
 
                 PixelvalueBasedTestByPlane(imageInMitk, mitk::PlaneGeometry::Frontal);
                 PixelvalueBasedTestByPlane(imageInMitk, mitk::PlaneGeometry::Sagittal);
                 PixelvalueBasedTestByPlane(imageInMitk, mitk::PlaneGeometry::Transversal);
 
   }
 
   static void PixelvalueBasedTestByPlane(mitk::Image* imageInMitk, mitk::PlaneGeometry::PlaneOrientation orientation){
 
     typedef itk::Image<unsigned short, 3> ImageType;
 
     //set the seed of the rand function
     srand((unsigned)time(0));
     
     /* setup a random orthogonal plane */
     int sliceindex = 17;//rand() % 32;
     bool isFrontside = true; 
     bool isRotated = false;
 
 
                 if( orientation == mitk::PlaneGeometry::Transversal)
     {
       /*isFrontside = false;
       isRotated = true;*/
     }
 
 
     
     mitk::PlaneGeometry::Pointer plane = mitk::PlaneGeometry::New();
 
      
     plane->InitializeStandardPlane(imageInMitk->GetGeometry(), orientation, sliceindex, isFrontside, isRotated);
     
     mitk::Point3D origin = plane->GetOrigin();
     mitk::Vector3D normal;
     normal = plane->GetNormal();
     
 
     normal.Normalize();
     
     origin += normal * 0.5;//pixelspacing is 1, so half the spacing is 0.5
     
     plane->SetOrigin(origin);
     
     //we dont need this any more, because we are only testing orthogonal planes
     /*mitk::Vector3D rotationVector;
     rotationVector[0] = randFloat();
     rotationVector[1] = randFloat();
     rotationVector[2] = randFloat();
 
 
     float degree = randFloat() * 180.0;
 
     mitk::RotationOperation* op = new mitk::RotationOperation(mitk::OpROTATE, plane->GetCenter(), rotationVector, degree);
     plane->ExecuteOperation(op);
     delete op;*/
 
     /* end setup plane */
 
 
     /* define a point in the 3D volume.
      * add the two axis vectors of the plane (each multiplied with a
      * random number) to the origin. now the two random numbers
      * become our index coordinates in the 2D image, because the
      * length of the axis vectors is 1.
      */
     mitk::Point3D planeOrigin =  plane->GetOrigin();
     mitk::Vector3D axis0, axis1;
     axis0 = plane->GetAxisVector(0);
     axis1 = plane->GetAxisVector(1);
     axis0.Normalize();
     axis1.Normalize();
 
 
     unsigned char n1 = 7;// rand() % 32;
     unsigned char n2 = 13;// rand() % 32;
     
 
     mitk::Point3D testPoint3DInWorld;
     testPoint3DInWorld = planeOrigin + (axis0 * n1) + (axis1 * n2);
 
     //get the index of the point in the 3D volume
     ImageType::IndexType testPoint3DInIndex;
     imageInMitk->GetGeometry()->WorldToIndex(testPoint3DInWorld, testPoint3DInIndex);
 
     mitk::Index3D testPoint2DInIndex;
     
     /* end define a point in the 3D volume.*/
 
 
     //do reslicing at the plane
     mitk::ExtractSliceFilter::Pointer slicer = mitk::ExtractSliceFilter::New();
     slicer->SetInput(imageInMitk);
     slicer->SetWorldGeometry(plane);
     
     slicer->Update();
 
     mitk::Image::Pointer slice = slicer->GetOutput();
 
     // Get TestPoiont3D as Index in Slice
     slice->GetGeometry()->WorldToIndex(testPoint3DInWorld,testPoint2DInIndex);
     
 
     mitk::Point3D p, sliceIndexToWorld, imageIndexToWorld;
     p[0] = testPoint2DInIndex[0];
     p[1] = testPoint2DInIndex[1];
     p[2] = testPoint2DInIndex[2];
     slice->GetGeometry()->IndexToWorld(p, sliceIndexToWorld);
     
     p[0] = testPoint3DInIndex[0];
     p[1] = testPoint3DInIndex[1];
     p[2] = testPoint3DInIndex[2];
     imageInMitk->GetGeometry()->IndexToWorld(p, imageIndexToWorld);
     
 
 
     //compare the pixelvalues of the defined point in the 3D volume with the value of the resliced image
     unsigned short valueAt3DVolume = imageInMitk->GetPixelValueByIndex(testPoint3DInIndex);//image->GetPixel(testPoint3DInIndex);
     unsigned short valueAt3DVolumeByWorld = imageInMitk->GetPixelValueByWorldCoordinate(testPoint3DInWorld);
     unsigned short valueAtSlice = slice->GetPixelValueByIndex(testPoint2DInIndex);
 
     //valueAt3DVolume == valueAtSlice is not always working. because of rounding errors
     //indices are shifted
     MITK_TEST_CONDITION(valueAt3DVolume == valueAtSlice, "comparing pixelvalues for orthogonal plane");
 
 
     vtkSmartPointer<vtkImageData> imageInVtk = vtkSmartPointer<vtkImageData>::New();
     imageInVtk = imageInMitk->GetVtkImageData();
     vtkSmartPointer<vtkImageData> sliceInVtk = vtkSmartPointer<vtkImageData>::New();
     sliceInVtk = slice->GetVtkImageData();
 
     double PixelvalueByMitkOutput = sliceInVtk->GetScalarComponentAsDouble(n1, n2, 0, 0);
     double valueVTKinImage = imageInVtk->GetScalarComponentAsDouble(testPoint3DInIndex[0], testPoint3DInIndex[1], testPoint3DInIndex[2], 0);
 
 
     /* Test that everything is working equally if vtkoutput is used instead of the default output 
      * from mitk ImageToImageFilter
      */
     mitk::ExtractSliceFilter::Pointer slicerWithVtkOutput = mitk::ExtractSliceFilter::New();
     slicerWithVtkOutput->SetInput(imageInMitk);
     slicerWithVtkOutput->SetWorldGeometry(plane);
     slicerWithVtkOutput->SetVtkOutputRequest(true);
     
     slicerWithVtkOutput->Update();
     vtkSmartPointer<vtkImageData> vtkImageByVtkOutput = vtkSmartPointer<vtkImageData>::New();
     vtkImageByVtkOutput = slicerWithVtkOutput->GetVtkOutput();
     double PixelvalueByVtkOutput = vtkImageByVtkOutput->GetScalarComponentAsDouble(n1, n2, 0, 0);
 
     MITK_TEST_CONDITION(PixelvalueByMitkOutput == PixelvalueByVtkOutput, "testing convertion of image output vtk->mitk by reslicer");
 
 
 
 /*================ mbilog outputs ===========================*/
 #ifdef EXTRACTOR_DEBUG
     MITK_INFO << "\n" << "TESTINFO index: " << sliceindex << " orientation: " << orientation << " frontside: " << isFrontside << " rotated: " << isRotated;
     MITK_INFO << "\n" << "slice index to world: " << sliceIndexToWorld;
     MITK_INFO << "\n" << "image index to world: "  << imageIndexToWorld;
 
     MITK_INFO  << "\n" << "vtk: slice: " << PixelvalueByMitkOutput << ", image: "<< valueVTKinImage;
 
     MITK_INFO << "\n" << "testPoint3D InWorld" << testPoint3DInWorld << " is " << testPoint2DInIndex << " in 2D";
     MITK_INFO << "\n" << "randoms: " << ((int)n1) << ", " << ((int)n2);
     MITK_INFO << "\n" << "point is inside plane: " << plane->IsInside(testPoint3DInWorld) << " and volume: " << imageInMitk->GetGeometry()->IsInside(testPoint3DInWorld);
     
     MITK_INFO << "\n" << "volume idx: " << testPoint3DInIndex << " = " << valueAt3DVolume ;
     MITK_INFO << "\n" << "volume world: " << testPoint3DInWorld << " = " << valueAt3DVolumeByWorld ;
     MITK_INFO << "\n" << "slice idx: " << testPoint2DInIndex << " = " << valueAtSlice ;
 
     mitk::Index3D curr;
     curr[0] = curr[1] = curr[2] = 0;
 
     for( int i = 0; i < 32 ; ++i){
       for( int j = 0; j < 32; ++j){
         ++curr[1];
         if(slice->GetPixelValueByIndex(curr) == valueAt3DVolume){
           MITK_INFO << "\n" << valueAt3DVolume << " MATCHED mitk " << curr;
         }
       }
       curr[1] = 0;
       ++curr[0];
     }
 
     typedef itk::Image<unsigned short, 2> Image2DType;
 
     Image2DType::Pointer img  = Image2DType::New();
     CastToItkImage(slice, img);
     typedef itk::ImageRegionConstIterator< Image2DType > Iterator2D;
     
     Iterator2D iter(img, img->GetLargestPossibleRegion());
     iter.GoToBegin();
     while( !iter.IsAtEnd() ){
     
       if(img->GetPixel(iter.GetIndex()) == valueAt3DVolume) MITK_INFO << "\n" << valueAt3DVolume << " MATCHED itk " << iter.GetIndex();
       
       ++iter;
     }
 #endif //EXTRACTOR_DEBUG
   }
 
 
   /* random a float value */
   static float randFloat(){ return (((float)rand()+1.0) / ((float)RAND_MAX + 1.0)) + (((float)rand()+1.0) / ((float)RAND_MAX + 1.0)) / ((float)RAND_MAX + 1.0);}
 
 
 
 
   /* create a sphere with the size of the given testVolumeSize*/
   static void InitializeTestVolume()
   {
 
   #ifdef CREATE_VOLUME
 
     
     //do sphere creation
     ItkVolumeGeneration();
 
     #ifdef SAVE_VOLUME
       //save in file
       mitk::ImageWriter::Pointer writer = mitk::ImageWriter::New();
       writer->SetInput(TestVolume);
 
       
       std::string file;
 
       std::ostringstream filename;
       filename << "C:\\home\\schroedt\\MITK\\Modules\\ImageExtraction\\Testing\\Data\\sphere_";
       filename << TestvolumeSize;
       filename << ".nrrd";
 
       file = filename.str();
        
       writer->SetFileName(file);
       writer->Update();
     #endif//SAVE_VOLUME
 
   #endif
 
 
   #ifndef CREATE_VOLUME //read from file
     
     mitk::StandardFileLocations::Pointer locator = mitk::StandardFileLocations::GetInstance();
 
     std::string filename = locator->FindFile("sphere_512.nrrd.mhd", "Modules/ImageExtraction/Testing/Data");
 
     mitk::ItkImageFileReader::Pointer reader = mitk::ItkImageFileReader::New();
     reader->SetFileName(filename);
   
     reader->Update();
     TestVolume = reader->GetOutput();
 
   #endif
 
   #ifdef CALC_TESTFAILURE_DEVIATION
     //get the TestFailureDeviation in %
     AccessFixedDimensionByItk(TestVolume, CalcTestFailureDeviation, 3);
   #endif
   }
 
   
   //the test result of the sphere reslice
   struct SliceProperties{
     double planeDistanceToSphereCenter;
     double diameterInMM;
     double diameterInPixel;
     double diameterCalculated;
     double percentageRadiusToPixel;
     double areaCalculated;
     double areaInPixel;
     double percentageAreaCalcToPixel;
   };
 
 
   static mitk::Image::Pointer TestVolume;
   static double TestvolumeSize;
   static mitk::PlaneGeometry::Pointer TestPlane;
   static std::string TestName;
   static unsigned char pixelValueSet;
   static SliceProperties testResults;
   static double TestFailureDeviation;
 
 
 
 private:
   
   /*
    * Generate a sphere with a radius of TestvolumeSize / 4.0 
    */
   static void ItkVolumeGeneration ()
   {
     typedef itk::Image<unsigned char, 3> TestVolumeType;
 
     typedef itk::ImageRegionConstIterator< TestVolumeType > ImageIterator;
 
     TestVolumeType::Pointer sphereImage = TestVolumeType::New();
 
     TestVolumeType::IndexType start;
     start[0] = start[1] = start[2] = 0;
 
     TestVolumeType::SizeType size;
     size[0] = size[1] = size[2] = TestvolumeSize;
 
     TestVolumeType::RegionType imgRegion;
     imgRegion.SetSize(size);
     imgRegion.SetIndex(start);
 
     sphereImage->SetRegions(imgRegion);
     sphereImage->SetSpacing(1.0);
     sphereImage->Allocate();
 
     sphereImage->FillBuffer(0);
 
     
     mitk::Vector3D center;
     center[0] = center[1] = center[2] = TestvolumeSize / 2.0;
 
 
     double radius = TestvolumeSize / 4.0;
 
     double pixelValue = pixelValueSet;
 
     double distanceToCenter = 0.0;
 
     
     ImageIterator imageIterator( sphereImage, sphereImage->GetLargestPossibleRegion() );
     imageIterator.GoToBegin();
 
     
     mitk::Vector3D currentVoxelInIndex;
     
     while ( !imageIterator.IsAtEnd() )
     {
       currentVoxelInIndex[0] = imageIterator.GetIndex()[0];
       currentVoxelInIndex[1] = imageIterator.GetIndex()[1];
       currentVoxelInIndex[2] = imageIterator.GetIndex()[2];
 
       distanceToCenter = (center + ( currentVoxelInIndex * -1.0 )).GetNorm();
 
       //if distance to center is smaller then the radius of the sphere
       if( distanceToCenter < radius)
       {
         sphereImage->SetPixel(imageIterator.GetIndex(), pixelValue);
       }
 
       ++imageIterator;
     }
 
     CastToMitkImage(sphereImage, TestVolume);
   }
 
 
   
 
 
   /* calculate the devation of the voxel object to the mathematical sphere object.
    * this is use to make a statement about the accuracy of the resliced image, eg. the circle's diameter or area.
    */
   template<typename TPixel, unsigned int VImageDimension>
   static void CalcTestFailureDeviation (itk::Image<TPixel, VImageDimension>* inputImage)
   {
     typedef itk::Image<TPixel, VImageDimension> InputImageType;
     typedef itk::ImageRegionConstIterator< InputImageType > ImageIterator;
 
     ImageIterator iterator(inputImage, inputImage->GetLargestPossibleRegion());
     iterator.GoToBegin();
 
     int volumeInPixel = 0;
 
     while( !iterator.IsAtEnd() )
     {
       if(inputImage->GetPixel(iterator.GetIndex()) == pixelValueSet) volumeInPixel++;
       ++iterator;
     }
 
     double diameter  = TestvolumeSize / 2.0;
     double volumeCalculated = (1.0 / 6.0) * 3.14159265358979 * std::pow(diameter, 3);
 
     
     double volumeDeviation = std::abs( 100 - (100 / volumeCalculated * volumeInPixel) );
 
 
     typename InputImageType::IndexType index;
     index[0] = index[1] =  TestvolumeSize / 2.0;
     index[2] = 0;
 
     int sumpixels = 0;
     while (index[2] < TestvolumeSize )
     {
       if(inputImage->GetPixel(index) == pixelValueSet) sumpixels++;
       index[2] += 1;
     }
     
     
     double diameterDeviation = std::abs( 100 - (100 / diameter * sumpixels) );
   #ifdef DEBUG
     MITK_INFO << "volume deviation: " << volumeDeviation << " diameter deviation:" << diameterDeviation;
   #endif
     mitkExtractSliceFilterTestClass::TestFailureDeviation = (volumeDeviation + diameterDeviation) / 2.0;
   }
 
 
 };
 /*================ #END class ================*/
 
 
 
 
 
 /*================#BEGIN Instanciation of members ================*/
 mitk::Image::Pointer mitkExtractSliceFilterTestClass::TestVolume = mitk::Image::New();
 double mitkExtractSliceFilterTestClass::TestvolumeSize = 256.0;
 mitk::PlaneGeometry::Pointer mitkExtractSliceFilterTestClass::TestPlane = mitk::PlaneGeometry::New();
 std::string mitkExtractSliceFilterTestClass::TestName = "";
 unsigned char mitkExtractSliceFilterTestClass::pixelValueSet = 255;
 mitkExtractSliceFilterTestClass::SliceProperties mitkExtractSliceFilterTestClass::testResults = {-1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0};
 double mitkExtractSliceFilterTestClass::TestFailureDeviation = 0.0;
 /*================ #END Instanciation of members ================*/
 
 
 
 
 
 /*================ #BEGIN test main ================*/
 int mitkExtractSliceFilterTest(int argc, char* argv[])
 {
 
   MITK_TEST_BEGIN("mitkExtractSliceFilterTest")
 
 
   //pixelvalue based testing
   mitkExtractSliceFilterTestClass::PixelvalueBasedTest();
 
   //initialize sphere test volume
   mitkExtractSliceFilterTestClass::InitializeTestVolume();
   
 
   mitk::Vector3D spacing = mitkExtractSliceFilterTestClass::TestVolume->GetGeometry()->GetSpacing();
 
 
   //the center of the sphere = center of image
   double sphereCenter = mitkExtractSliceFilterTestClass::TestvolumeSize / 2.0;
 
   double planeSize = mitkExtractSliceFilterTestClass::TestvolumeSize;
 
 
 
   /* transversal plane */
   mitk::PlaneGeometry::Pointer geometryTransversal = mitk::PlaneGeometry::New();
         geometryTransversal->InitializeStandardPlane(planeSize, planeSize, spacing, mitk::PlaneGeometry::Transversal, sphereCenter, false, true);
   geometryTransversal->ChangeImageGeometryConsideringOriginOffset(true);
 
   mitk::Point3D origin = geometryTransversal->GetOrigin();
   mitk::Vector3D normal;
   normal = geometryTransversal->GetNormal();
 
 
   normal.Normalize();
 
   origin += normal * 0.5;//pixelspacing is 1, so half the spacing is 0.5
 
   //geometryTransversal->SetOrigin(origin);
 
   mitkExtractSliceFilterTestClass::TestSlice(geometryTransversal, "Testing transversal plane");
   /* end transversal plane */
 
 
 
   /* sagittal plane */
   mitk::PlaneGeometry::Pointer geometrySagital = mitk::PlaneGeometry::New();
   geometrySagital->InitializeStandardPlane(planeSize, planeSize, spacing, mitk::PlaneGeometry::Sagittal, sphereCenter, true, false);
   geometrySagital->ChangeImageGeometryConsideringOriginOffset(true);
 
   origin = geometrySagital->GetOrigin();
   normal = geometrySagital->GetNormal();
 
 
   normal.Normalize();
 
   origin += normal * 0.5;//pixelspacing is 1, so half the spacing is 0.5
 
   //geometrySagital->SetOrigin(origin);
 
   mitkExtractSliceFilterTestClass::TestSlice(geometrySagital, "Testing sagittal plane");
   /* sagittal plane */
 
 
 
   /* sagittal shifted plane */
   mitk::PlaneGeometry::Pointer geometrySagitalShifted = mitk::PlaneGeometry::New();
   geometrySagitalShifted->InitializeStandardPlane(planeSize, planeSize, spacing, mitk::PlaneGeometry::Sagittal, (sphereCenter - 14), true, false);
   geometrySagitalShifted->ChangeImageGeometryConsideringOriginOffset(true);
 
   origin = geometrySagitalShifted->GetOrigin();
   normal = geometrySagitalShifted->GetNormal();
 
 
   normal.Normalize();
 
   origin += normal * 0.5;//pixelspacing is 1, so half the spacing is 0.5
 
   //geometrySagitalShifted->SetOrigin(origin);
 
   mitkExtractSliceFilterTestClass::TestSlice(geometrySagitalShifted, "Testing sagittal plane shifted");
   /* end sagittal shifted plane */
 
 
 
   /* coronal plane */
   mitk::PlaneGeometry::Pointer geometryCoronal = mitk::PlaneGeometry::New();
   geometryCoronal->InitializeStandardPlane(planeSize, planeSize, spacing, mitk::PlaneGeometry::Frontal, sphereCenter, true, false);
   geometryCoronal->ChangeImageGeometryConsideringOriginOffset(true);
 
   origin = geometryCoronal->GetOrigin();
   normal = geometryCoronal->GetNormal();
 
 
   normal.Normalize();
 
   origin += normal * 0.5;//pixelspacing is 1, so half the spacing is 0.5
 
   //geometryCoronal->SetOrigin(origin);
 
   mitkExtractSliceFilterTestClass::TestSlice(geometryCoronal, "Testing coronal plane");
   /* end coronal plane */
 
 
 
   /* oblique plane */
   mitk::PlaneGeometry::Pointer obliquePlane = mitk::PlaneGeometry::New();
   obliquePlane->InitializeStandardPlane(planeSize, planeSize, spacing, mitk::PlaneGeometry::Sagittal, sphereCenter, true, false);
   obliquePlane->ChangeImageGeometryConsideringOriginOffset(true);
 
   origin = obliquePlane->GetOrigin();
   normal = obliquePlane->GetNormal();
 
 
   normal.Normalize();
 
   origin += normal * 0.5;//pixelspacing is 1, so half the spacing is 0.5
 
   //obliquePlane->SetOrigin(origin);
 
   mitk::Vector3D rotationVector;
   rotationVector[0] = 0.2;
   rotationVector[1] = 0.4;
   rotationVector[2] = 0.62;
 
   float degree = 37.0;
 
   mitk::RotationOperation* op = new mitk::RotationOperation(mitk::OpROTATE, obliquePlane->GetCenter(), rotationVector, degree);
   obliquePlane->ExecuteOperation(op);
   delete op;
 
   mitkExtractSliceFilterTestClass::TestSlice(obliquePlane, "Testing oblique plane");
   /* end oblique plane */
 
 
 
   #ifdef SHOW_SLICE_IN_RENDER_WINDOW
     /*================ #BEGIN vtk render code ================*/
     
     //set reslicer for renderwindow
     mitk::ItkImageFileReader::Pointer reader = mitk::ItkImageFileReader::New();
 
     std::string filename =  "C:\\home\\Pics\\Pic3D.nrrd";
     reader->SetFileName(filename);
     
     reader->Update();
 
     mitk::Image::Pointer pic = reader->GetOutput();
     vtkSmartPointer<vtkImageReslice> slicer = vtkSmartPointer<vtkImageReslice>::New();
     
     slicer->SetInput(pic->GetVtkImageData());
 
 
     mitk::PlaneGeometry::Pointer obliquePl = mitk::PlaneGeometry::New();
                 obliquePl->InitializeStandardPlane(pic->GetGeometry(), mitk::PlaneGeometry::Sagittal, pic->GetGeometry()->GetCenter()[0], true, false);
     obliquePl->ChangeImageGeometryConsideringOriginOffset(true);
 
                mitk::Point3D origin2 = obliquePl->GetOrigin();
     mitk::Vector3D n;
     n = obliquePl->GetNormal();
     
 
     n.Normalize();
     
                 origin2 += n * 0.5;//pixelspacing is 1, so half the spacing is 0.5
     
                 obliquePl->SetOrigin(origin2);
 
     mitk::Vector3D rotation;
     rotation[0] = 0.534307;
     rotation[1] = 0.000439605;
     rotation[2] = 0.423017;
     MITK_INFO << rotation;
 
     float rotateDegree = 70;
 
     mitk::RotationOperation* operation = new mitk::RotationOperation(mitk::OpROTATE, obliquePl->GetCenter(), rotationVector, degree);
     obliquePl->ExecuteOperation(operation);
     delete operation;
     
 
     double origin[3];
     origin[0] = obliquePl->GetOrigin()[0];
     origin[1] = obliquePl->GetOrigin()[1];
     origin[2] = obliquePl->GetOrigin()[2];
     slicer->SetResliceAxesOrigin(origin);
 
     
     mitk::Vector3D right, bottom, normal;
     right  = obliquePl->GetAxisVector( 0 );
     bottom = obliquePl->GetAxisVector( 1 );
     normal = obliquePl->GetNormal();
 
     right.Normalize();
     bottom.Normalize();
     normal.Normalize();
     
     double cosines[9];
 
     mitk::vnl2vtk(right.GetVnlVector(), cosines);//x
 
     mitk::vnl2vtk(bottom.GetVnlVector(), cosines + 3);//y
 
     mitk::vnl2vtk(normal.GetVnlVector(), cosines + 6);//n
 
     slicer->SetResliceAxesDirectionCosines(cosines);
 
     slicer->SetOutputDimensionality(2);
     slicer->Update();
 
 
     //set vtk renderwindow
     vtkSmartPointer<vtkPlaneSource> vtkPlane = vtkSmartPointer<vtkPlaneSource>::New();
     vtkPlane->SetOrigin(0.0, 0.0, 0.0);
 
     //These two points define the axes of the plane in combination with the origin.
     //Point 1 is the x-axis and point 2 the y-axis.
     //Each plane is transformed according to the view (transversal, coronal and saggital) afterwards.
     vtkPlane->SetPoint1(1.0, 0.0, 0.0); //P1: (xMax, yMin, depth)
     vtkPlane->SetPoint2(0.0, 1.0, 0.0); //P2: (xMin, yMax, depth)
     //these are not the correct values for all slices, only a square plane by now
 
     vtkSmartPointer<vtkPolyDataMapper> imageMapper = vtkSmartPointer<vtkPolyDataMapper>::New();
     imageMapper->SetInputConnection(vtkPlane->GetOutputPort());
 
     
     vtkSmartPointer<vtkLookupTable> lookupTable = vtkSmartPointer<vtkLookupTable>::New();
 
     //built a default lookuptable
     lookupTable->SetRampToLinear();
     lookupTable->SetSaturationRange( 0.0, 0.0 );
     lookupTable->SetHueRange( 0.0, 0.0 );
     lookupTable->SetValueRange( 0.0, 1.0 );
     lookupTable->Build();
     //map all black values to transparent
     lookupTable->SetTableValue(0, 0.0, 0.0, 0.0, 0.0);
     lookupTable->SetRange(-255.0, 255.0);
     //lookupTable->SetRange(-1022.0, 1184.0);//pic3D range
 
     vtkSmartPointer<vtkTexture> texture = vtkSmartPointer<vtkTexture>::New();
 
 
     texture->SetInput(slicer->GetOutput());
     
     texture->SetLookupTable(lookupTable);
 
     texture->SetMapColorScalarsThroughLookupTable(true);
 
     vtkSmartPointer<vtkActor> imageActor = vtkSmartPointer<vtkActor>::New();
     imageActor->SetMapper(imageMapper);
     imageActor->SetTexture(texture);
     
 
     // Setup renderers
     vtkSmartPointer<vtkRenderer> renderer = vtkSmartPointer<vtkRenderer>::New();
     renderer->AddActor(imageActor);
 
     // Setup render window
     vtkSmartPointer<vtkRenderWindow> renderWindow = vtkSmartPointer<vtkRenderWindow>::New();
     renderWindow->AddRenderer(renderer);
 
     // Setup render window interactor
     vtkSmartPointer<vtkRenderWindowInteractor> renderWindowInteractor = vtkSmartPointer<vtkRenderWindowInteractor>::New();
     vtkSmartPointer<vtkInteractorStyleImage> style = vtkSmartPointer<vtkInteractorStyleImage>::New();
     renderWindowInteractor->SetInteractorStyle(style);
 
     // Render and start interaction
     renderWindowInteractor->SetRenderWindow(renderWindow);
     //renderer->AddViewProp(imageActor);
 
 
     renderWindow->Render();
     renderWindowInteractor->Start();
     // always end with this!
     /*================ #END vtk render code ================*/
   #endif //SHOW_SLICE_IN_RENDER_WINDOW
 
 
   MITK_TEST_END()
 }
diff --git a/Documentation/Doxygen/DeveloperManual/BuildInstructions.dox b/Documentation/Doxygen/DeveloperManual/BuildInstructions.dox
index 5e68094b90..d682ed5462 100644
--- a/Documentation/Doxygen/DeveloperManual/BuildInstructions.dox
+++ b/Documentation/Doxygen/DeveloperManual/BuildInstructions.dox
@@ -1,187 +1,201 @@
 /**
 \page BuildInstructionsPage Build Instructions
 
 \section BuildInstructions_Introduction Introduction
 
 The MITK build system (which is based on CMake) supports a "superbuild" process, meaning that it will download, configure, and build
 all required third-party libraries (except Qt) automatically. These instructions will show you how to use the MITK superbuild.
 
 \note This page explains explicitly how to build MITK itself. If you want to create your own project based on MITK, the process
 described below is completely automated. Please see <a href="http://www.mitk.org/wiki/SetupAMitkBasedProject">Setup a MITK-based project</a>
 
 For more advanced users, the last sections explain how to inject custom build libraries into the superbuild process.
 
 \section BuildInstructions_Prerequisites Prerequisites
 
 You need:
   -# Git from http://git-scm.com (there are also numerous third-party graphical clients available). We recomment using
      Git, but see below for a way how to get the current source code without using it.
   -# <a href="http://www.cmake.org">CMake</a> (version 2.8.4 or higher)
   -# <a href="http://qt.nokia.com">Qt</a> 4.x if you plan to develop Qt-based applications 
   (version 4.6 or above is recommended, we cannot guarantee compatibility with lower versions)
+  -# If you are using <b>Mac OS X</b> you need an Xcode installation as this provides the neccessary compilers and SDKs
+
+\attention For Mac OS X it is strongly recommended to use CMake version 2.8.8 or higher
   
 \section BuildInstructions_Qt A note about Qt
 
 Nokia provides several binary packages for Qt. You must make sure that the package you download matches
 your toolchain. On Linux, getting Qt by installing the packages provided by your Linux package manager is the preferred way.
 
 On Windows, the Nokia provided binaries are compiled for 32bit architectures. You cannot build your own project for a 64bit machine and
 use the 32bit Qt libraries. You have two options for a 64bit Qt-based application:
   -# Download an inofficial 64bit installer, for example <a href="http://code.google.com/p/qt-msvc-installer/">here</a>. Note
      that we cannot offer support for problems with MITK due to the usage of this kind of installers.
   -# Compile Qt yourself. This is shortly described below.
   
 To compile Qt on Windows using Visual Studio, follow the steps below:
 
   -# Download the Qt sources and unpack them, e.g. to C:/qt-everywhere-opensource-src-4.7.4
   -# Open a Visual Studio command prompt. Make sure to use the appropriate command prompt for either a 32 bit or 64 bit build.
      Note that Visual Studio Express does not come with 64bit compilers out of the box (the Professional version does).
   -# Configure Qt by executing the configure.exe command in your Qt source directory. The following configure options will
      build a Qt compatible with MITK:
      \verbatim
 configure.exe -prefix C:\Qt\4.7.4_vc9_x64 -debug-and-release -qt-sql-sqlite -no-multimedia -no-audio-backend -no-phonon -no-phonon-backend -no-declarative -mp -nomake examples -nomake demos -nomake docs
 \endverbatim
   -# Build and install the Qt libraries
      \verbatim
 nmake
 nmake install
 \endverbatim
      After "nmake install" completed successfully, you may delete your Qt source directory.
   
 \section BuildInstructions_Get_Source Get a source tree
 
 Since MITK is under active development we recommend to use git to get
 the most recent version. To make sure you get a stable tree, check the
 <a href="http://cdash.mitk.org/index.php?project=MITK">MITK dashboard</a>
 before checking out. If the build tree is not clean, you can specify an
 older revision for the checkout or get a stable tar ball from
 <a href="http://www.mitk.org">www.mitk.org</a>.
 
 If you don't want to use Git, you may also download the current source code (or any other older version)
 as a tar.gz package by clicking on the
 <a href="http://mitk.org/git/?p=MITK.git;a=shortlog;h=refs/heads/master">snapshot</a> link. You can then
 skip the clone step below.
 
 To clone MITK's current git repository do:
 
 \code
 git clone http://git.mitk.org/MITK.git
 \endcode
 
 \section BuildInstructions_Build_With_CMake Build MITK with CMake
 
 Create a new directory for the superbuild binary tree, change to it and call CMake:
 
 In the shell (assuming you current directory is the same as the one where you
 issued the git clone command):
 \code
 mkdir MITK-superbuild
 cd MITK-superbuild
 ccmake ../MITK
 \endcode
 
 If you use <B>Windows</B>, then you just start the CMake GUI and enter the location of the source and of the binary tree,
 choose a suitable generator and configure the project.
 
+If you use <b>Mac OS X</b> you will have to tweak the CMake configuration:
+ - First of all you have to check the selected compilers, i.e.:
+  - <tt><b>CMAKE_CXX_COMPILER</tt></b>
+  - <tt><b>CMAKE_C_COMPILER</tt></b>
+  - both should be either apple's clang or apple's gcc compiler
+ - Next you have to assure hat <tt><b>CMAKE_OSX_SYSROOT</tt></b> points to the correct SDK location:
+  - This is either /Developer/SDKs/Developer/SDKs/MacOSX10.7.sdk or if you have installed Xcode 4.3+ it is located in /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/
+ - Finally you should set the cmake variable <tt><b>MITK_USE_VTK_5_8_IN_SUPERBUILD</tt></b> to ON
+
 CMake will present you a couple of options, these are the most important ones:
 
  - <tt><b>MITK_USE_BLUEBERRY</b></tt> Build the BlueBerry application framework
  - <tt><b>MITK_USE_Boost</b></tt> Build MITK code which depends on Boost (this will download Boost 1.45.0)
  - <tt><b>MITK_USE_Boost_LIBRARIES</b></tt> If you need binary Boost libraries, specify them here.
  - <tt><b>MITK_USE_OpenCV</b></tt> Build MITK code which depends on OpenCV (this will download and build OpenCV 2.3)
  - <tt><b>MITK_USE_Python</b></tt> Enables Python wrapping in MITK. This will also configure ITK, VTK, and OpenCV (if enabled) to build Python wrappers.
  - <tt><b>MITK_USE_QT</b></tt> Build MITK code which depends on Qt
  - <tt><b>QT_QMAKE_EXECUTABLE</b></tt> The path to the qmake executable of your Qt installation
  
 If you are satisfied with the configuration of your MITK superbuild, generate the project files with 
 CMake by pressing "Generate".
 
-<b>Linux</b> users usually just enter "make" (optionally supplying the number threads to be used for
+<b>Linux</b> and <b>Mac OS X</b> users usually just enter "make" (optionally supplying the number threads to be used for
 a parallel build):
 \code
 make -j4
 \endcode
 
+\note On <b>Mac OS X:</b> If you follow these steps CMake will produce Makefiles and therefore you cannot use Xcode but you have to use e.g. the QtCreator for programming. At the moment developing MITK with Xcode is not supported and using Xcode the superbuild doesn't complete without errors.
+
 <b>Windows</b> users using Visual Studio can open the generated <tt>MITK-superbuild.sln</tt> solution file
 in the <tt>MITK-superbuild</tt> directory and start the build by building the <tt>BUILD_ALL</tt> project.
 
 \section BuildInstructions_Customize Customize your MITK superbuild
 
 The MITK superbuild configured MITK with all needed external libraries. The build directories of these libraries,
 and of MITK itself are located inside the <tt>MITK-superbuild</tt> directory. For example, the directory layout may
 look like:
 
 \code
 MITK-superbuild
  |- ITK-build
  |- VTK-build
  |- MITK-build
 \endcode
 
 To change the configuration of the MITK build, choose the MITK-build directory as the binary directory in the
 CMake GUI. After generating the project files, build the MITK project by either issuing "make" in the MITK-build
 directory (Linux), or by opening MITK-build/MITK.sln and building the project with Visual Studio.
 
 You may also change the configuration of any project configured via the superbuild process. Make sure to also build
 the changed project and also the projects which depend on it.
 
 \section BuildInstructions_Running Running Applications
 
 On Linux, just execute the application you want to run. MITK executables are located in
 <tt>MITK-superbuild/MITK-build/bin</tt>
 
 On Windows, the <tt>PATH</tt> environment variable must contain the directories containging third-party libraries.
 The MITK build system generated Windows Batch files in the <tt>MITK-build</tt> directory which set up a correct
 environment and opens the appropriate Visual Studio solution file. Use (and maybe modify/enhance) these Batch files
 to be able to start and debug MITK applications from inside Visual Studio.
 
 \section BuildInstructions_Documentation Documentation
 
 If you have the <a href="http://www.doxygen.org">Doxygen</a> documentation tool installed, you get a new project
 (Visual Studio) or "make" target named "doc". You can build this to generate the HTML documentation of MITK in 
 the Documentation/Doxygen directory of your MITK-build binary tree or in the <tt>MITK_DOXYGEN_OUTPUT_DIR</tt> CMake variable
 (if specified).
 
 \section BuildInstructions_Extending Extend MITK on your own (using the application framework BlueBerry)
 
 Please see \ref NewPluginPage
 
 \section BuildInstructions_As_Toolkit Use MITK in your own project (as a toolkit)
 
 To use MITK in your external project, add the CMake command <code>find_package(MITK REQUIRED)</code>
 to your CMakeLists.txt and make use of the CMake macros <code>MITK_CHECK_MODULE(result_var <module-list>)
 </code> and <code>MITK_USE_MODULE(<module-list>)</code> provided by MITK.
 
 Here is an example CMakeLists.txt (from the Examples/QtAppExample/ directory) which allows you
 to create a Qt based application using MITK to display an image.
 \include QtAppExample/CMakeLists.txt
 
 \section BuildInstructions_Advanced_Customization Superbuild Customization
 
 You can inject pre-build third-party libraries into the MITK superbuild by setting certain CMake variables before
 the first configure step. MITK will then use these third-party libraries instead of downloading and building them
 itself. Note you must take care to configure those libraries with all options MITK requires.
 
 The variables listed below are provided for injecting third-party libraries. Their occurrence in the CMake GUI or
 in ccmake may depend on specific MITK_USE_* options set to ON. You may also use the variable names below without the
 <tt>EXTERNAL_</tt> prefix, for example when providing their values on a command line call to CMake.
 
  - <tt><b>EXTERNAL_BOOST_ROOT</b></tt> Set this variable to your custom Boost installation
  - <tt><b>EXTERNAL_CTK_DIR</b></tt> Set this variable to your CTK binary tree (the directory containing the CTKConfig.cmake file)
  - <tt><b>EXTERNAL_CableSwig_DIR</b></tt> Set this variable to your CableSwig binary tree for Python wrapping (the directory containing the CableSwigConfig.cmake file)
  - <tt><b>EXTERNAL_DCMTK_DIR</b></tt> Set this variable to your DCMTK binary tree (the directory containing the DCMTKConfig.cmake file)
  - <tt><b>EXTERNAL_GDCM_DIR</b></tt> Set this variable to your GDCM binary tree (the directory containing the GDCMConfig.cmake file)
  - <tt><b>EXTERNAL_ITK_DIR</b></tt> Set this variable to your ITK binary tree (the directory containing the ITKConfig.cmake file)
  - <tt><b>EXTERNAL_OpenCV_DIR</b></tt> Set this variable to your OpenCV binary tree (the directory containing the OpenCVConfig.cmake file)
  - <tt><b>EXTERNAL_VTK_DIR</b></tt> Set this variable to your VTK binary tree (the directory containing the VTKConfig.cmake file)
  
 To set CMake options before the first configure step is invoked, supply them on the command line, i.e.
 
 \code
 ccmake -DITK_DIR:PATH=/opt/ITK-release ../MITK
 \endcode
 
 See the following link for more information about how to configure third-party libraries:
 \subpage BuildToolkits "How to build ITK, VTK and QT"
 
 */
diff --git a/Documentation/Doxygen/DeveloperManual/SupportedPlatforms.md b/Documentation/Doxygen/DeveloperManual/SupportedPlatforms.md
index 2c0669b367..3a59b5239e 100644
--- a/Documentation/Doxygen/DeveloperManual/SupportedPlatforms.md
+++ b/Documentation/Doxygen/DeveloperManual/SupportedPlatforms.md
@@ -1,51 +1,51 @@
 
 Supported Platforms  {#SupportedPlatformsPage}
 ===================
 
 MITK is a cross-platform framework and is available for the following platforms:
 
 - Windows
 - Linux/X11
 - Mac OS X
 
 Supported Platforms Details
 ---------------------------
 
 The MITK team provides support for the most frequently used platforms and continuously runs testing procedures
 to ensure compatibility. Due to the large amount of possible combinations of operating systems and compiler versions,
 we divide platform support into two test categories (Tier 1 and Tier 2).
 
 Although MITK may be built on a range of platform-compiler combinations, only a subset of these are actively
 support by the MITK development team.
 
 Tier 1 Platforms
 ----------------
 
 All Tier 1 platforms are continuously tested by our unit test suite and other internal testing procedures.
 Errors or bugs discovered in these platforms are prioritized and corrected as soon as possible.
 
 | Platform                            | Compilers
 | ----------------------------------- | -----------------------------
 | Ubuntu Linux 11.04 (64-bit)         | As provided by Ubuntu
 | Microsoft Windows 7 (32 and 64-bit) | MSVC 2008 SP1
 | Apple Mac OS X 10.7 "Lion"          | LLVM-GCC as provided by Apple
 
 
 Tier 2 Platforms
 ----------------
 
 Tier 2 platforms may or may not be tested on a regular basis. Some Tier 2 platforms are used by individual
 members of the MITK development team on a daily basis and some only receive occasional testing. While we
 strive to support these platforms, MITK users should note that errors may be present in released versions
 as well as in the current master branch.
 
 | Platform                           | Compilers
 | ---------------------------------- | -----------------------------
-| Ubuntu Linux 11.10 (64-bit)        | As provided by Ubuntu
-| Microsoft Windows 7 (32-bit)       | MSVC 2010
+| Ubuntu Linux 11.04 (32-bit)        | As provided by Ubuntu
+| Microsoft Windows XP (32-bit)      | MSVC 2008 SP1
 | Apple Mac OS X 10.6 "Snow Leopard" | LLVM-GCC as provided by Apple
 
 
 All platforms not listed above are not officially supported by the MITK team. However, we will happily accept
 contributions to improve support for other platforms.
 
diff --git a/Documentation/Doxygen/Modules/ModuleMicroServices.dox b/Documentation/Doxygen/Modules/ModuleMicroServices.dox
index 9307cb0c75..e3e6869d38 100644
--- a/Documentation/Doxygen/Modules/ModuleMicroServices.dox
+++ b/Documentation/Doxygen/Modules/ModuleMicroServices.dox
@@ -1,23 +1,30 @@
 
 /**
 
 \addtogroup MicroServices
 \ingroup Core
 
 */
 
 /**
 
+\addtogroup MicroServicesUtils
+\ingroup Core
+
+*/
+
+/**
+
 \defgroup MicroServices_Interfaces Micro Services Interfaces
 \ingroup Core
 
 \brief Classes (interfaces) in this category are explicitely designed for usage with the MITK Micro Services.
 
 All classes in this category are structs with no non-static members and only pure virtual functions
 (except for an inlined virtual destructor). Such a class will be called a \e interface.
 
 These interfaces are meant to be implemented by MITK module developers to enhance or overwrite certain
 aspects of the MITK toolkit. All implementations must be registered in the implementing module's
 \e activator (see mitk::ModuleActivator) using the module's mitk::ModuleContext instance.
 */
 
diff --git a/Documentation/doxygen.conf.in b/Documentation/doxygen.conf.in
index 6c7dbfa00d..94de70e947 100644
--- a/Documentation/doxygen.conf.in
+++ b/Documentation/doxygen.conf.in
@@ -1,1900 +1,1903 @@
-# Doxyfile 1.8.0
+# Doxyfile 1.8.1
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
 #
 # All text after a hash (#) is considered a comment and will be ignored.
 # The format is:
 #       TAG = value [value, ...]
 # For lists items can also be appended using:
 #       TAG += value [value, ...]
 # Values that contain spaces should be placed between quotes (" ").
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
 
 # This tag specifies the encoding used for all characters in the config file
 # that follow. The default is UTF-8 which is also the encoding used for all
 # text before the first occurrence of this tag. Doxygen uses libiconv (or the
 # iconv built into libc) for the transcoding. See
 # http://www.gnu.org/software/libiconv for the list of possible encodings.
 
 DOXYFILE_ENCODING      = UTF-8
 
 # The PROJECT_NAME tag is a single word (or sequence of words) that should
 # identify the project. Note that if you do not use Doxywizard you need
 # to put quotes around the project name if it contains spaces.
 
 PROJECT_NAME           = MITK
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
 PROJECT_NUMBER         = @MITK_VERSION_STRING@
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer
 # a quick idea about the purpose of the project. Keep the description short.
 
 PROJECT_BRIEF          = "Medical Imaging Interaction Toolkit"
 
 # With the PROJECT_LOGO tag one can specify an logo or icon that is
 # included in the documentation. The maximum height of the logo should not
 # exceed 55 pixels and the maximum width should not exceed 200 pixels.
 # Doxygen will copy the logo to the output directory.
 
 PROJECT_LOGO           =
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
 OUTPUT_DIRECTORY       = @MITK_DOXYGEN_OUTPUT_DIR@
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
 # format and will distribute the generated files over these directories.
 # Enabling this option can be useful when feeding doxygen a huge amount of
 # source files, where putting all generated files in the same directory would
 # otherwise cause performance problems for the file system.
 
 CREATE_SUBDIRS         = NO
 
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
 # The default language is English, other supported languages are:
 # Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
 # Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
 # Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
 # messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
 # Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
 # Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
 
 OUTPUT_LANGUAGE        = English
 
 # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
 # include brief member descriptions after the members that are listed in
 # the file and class documentation (similar to JavaDoc).
 # Set to NO to disable this.
 
 BRIEF_MEMBER_DESC      = YES
 
 # If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
 # the brief description of a member or function before the detailed description.
 # Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
 # brief descriptions will be completely suppressed.
 
 REPEAT_BRIEF           = YES
 
 # This tag implements a quasi-intelligent brief description abbreviator
 # that is used to form the text in various listings. Each string
 # in this list, if found as the leading text of the brief description, will be
 # stripped from the text and the result after processing the whole list, is
 # used as the annotated text. Otherwise, the brief description is used as-is.
 # If left blank, the following values are used ("$name" is automatically
 # replaced with the name of the entity): "The $name class" "The $name widget"
 # "The $name file" "is" "provides" "specifies" "contains"
 # "represents" "a" "an" "the"
 
 ABBREVIATE_BRIEF       =
 
 # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
 # Doxygen will generate a detailed section even if there is only a brief
 # description.
 
 ALWAYS_DETAILED_SEC    = NO
 
 # If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
 # inherited members of a class in the documentation of that class as if those
 # members were ordinary class members. Constructors, destructors and assignment
 # operators of the base classes will not be shown.
 
 INLINE_INHERITED_MEMB  = NO
 
 # If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
 # path before files name in the file list and in the header files. If set
 # to NO the shortest path that makes the file name unique will be used.
 
 FULL_PATH_NAMES        = NO
 
 # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
 # can be used to strip a user-defined part of the path. Stripping is
 # only done if one of the specified strings matches the left-hand part of
 # the path. The tag can be used to show relative paths in the file list.
 # If left blank the directory from which doxygen is run is used as the
 # path to strip.
 
 STRIP_FROM_PATH        =
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
 # the path mentioned in the documentation of a class, which tells
 # the reader which header file to include in order to use a class.
 # If left blank only the name of the header file containing the class
 # definition is used. Otherwise one should specify the include paths that
 # are normally passed to the compiler using the -I flag.
 
 STRIP_FROM_INC_PATH    =
 
 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
 # (but less readable) file names. This can be useful if your file system
 # doesn't support long names like on DOS, Mac, or CD-ROM.
 
 SHORT_NAMES            = NO
 
 # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
 # will interpret the first line (until the first dot) of a JavaDoc-style
 # comment as the brief description. If set to NO, the JavaDoc
 # comments will behave just like regular Qt-style comments
 # (thus requiring an explicit @brief command for a brief description.)
 
 JAVADOC_AUTOBRIEF      = NO
 
 # If the QT_AUTOBRIEF tag is set to YES then Doxygen will
 # interpret the first line (until the first dot) of a Qt-style
 # comment as the brief description. If set to NO, the comments
 # will behave just like regular Qt-style comments (thus requiring
 # an explicit \brief command for a brief description.)
 
 QT_AUTOBRIEF           = NO
 
 # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
 # treat a multi-line C++ special comment block (i.e. a block of //! or ///
 # comments) as a brief description. This used to be the default behaviour.
 # The new default is to treat a multi-line C++ comment block as a detailed
 # description. Set this tag to YES if you prefer the old behaviour instead.
 
 MULTILINE_CPP_IS_BRIEF = NO
 
 # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
 # member inherits the documentation from any documented member that it
 # re-implements.
 
 INHERIT_DOCS           = YES
 
 # If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
 # a new page for each member. If set to NO, the documentation of a member will
 # be part of the file/class/namespace that contains it.
 
 SEPARATE_MEMBER_PAGES  = NO
 
 # The TAB_SIZE tag can be used to set the number of spaces in a tab.
 # Doxygen uses this value to replace tabs by spaces in code fragments.
 
 TAB_SIZE               = 8
 
 # This tag can be used to specify a number of aliases that acts
 # as commands in the documentation. An alias has the form "name=value".
 # For example adding "sideeffect=\par Side Effects:\n" will allow you to
 # put the command \sideeffect (or @sideeffect) in the documentation, which
 # will result in a user-defined paragraph with heading "Side Effects:".
 # You can put \n's in the value part of an alias to insert newlines.
 
 ALIASES                = "FIXME=\par Fix Me's:\n" \
                          "BlueBerry=\if BLUEBERRY" \
                          "endBlueBerry=\endif" \
                          "bundlemainpage{1}=\page \1" \
                          "embmainpage{1}=\page \1"
 
 # This tag can be used to specify a number of word-keyword mappings (TCL only).
 # A mapping has the form "name=value". For example adding
 # "class=itcl::class" will allow you to use the command class in the
 # itcl::class meaning.
 
 TCL_SUBST              =
 
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
 # sources only. Doxygen will then generate output that is more tailored for C.
 # For instance, some of the names that are used will be different. The list
 # of all members will be omitted, etc.
 
 OPTIMIZE_OUTPUT_FOR_C  = NO
 
 # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
 # sources only. Doxygen will then generate output that is more tailored for
 # Java. For instance, namespaces will be presented as packages, qualified
 # scopes will look different, etc.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
 # Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
 # sources only. Doxygen will then generate output that is more tailored for
 # Fortran.
 
 OPTIMIZE_FOR_FORTRAN   = NO
 
 # Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
 # sources. Doxygen will then generate output that is tailored for
 # VHDL.
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
 # Doxygen selects the parser to use depending on the extension of the files it
 # parses. With this tag you can assign which parser to use for a given extension.
 # Doxygen has a built-in mapping, but you can override or extend it using this
 # tag. The format is ext=language, where ext is a file extension, and language
 # is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
 # C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
 # doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
 # (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
 # you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
 
 EXTENSION_MAPPING      =
 
 # If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
 # comments according to the Markdown format, which allows for more readable
 # documentation. See http://daringfireball.net/projects/markdown/ for details.
 # The output of markdown processing is further processed by doxygen, so you
 # can mix doxygen, HTML, and XML commands with Markdown formatting.
 # Disable only in case of backward compatibilities issues.
 
 MARKDOWN_SUPPORT       = YES
 
 # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
 # to include (a tag file for) the STL sources as input, then you should
 # set this tag to YES in order to let doxygen match functions declarations and
 # definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
 # func(std::string) {}). This also makes the inheritance and collaboration
 # diagrams that involve STL classes more complete and accurate.
 
 BUILTIN_STL_SUPPORT    = YES
 
 # If you use Microsoft's C++/CLI language, you should set this option to YES to
 # enable parsing support.
 
 CPP_CLI_SUPPORT        = NO
 
 # Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
 # Doxygen will parse them like normal C++ but will assume all classes use public
 # instead of private inheritance when no explicit protection keyword is present.
 
 SIP_SUPPORT            = NO
 
 # For Microsoft's IDL there are propget and propput attributes to indicate getter
 # and setter methods for a property. Setting this option to YES (the default)
 # will make doxygen replace the get and set methods by a property in the
 # documentation. This will only work if the methods are indeed getting or
 # setting a simple type. If this is not the case, or you want to show the
 # methods anyway, you should set this option to NO.
 
 IDL_PROPERTY_SUPPORT   = YES
 
 # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
 # tag is set to YES, then doxygen will reuse the documentation of the first
 # member in the group (if any) for the other members of the group. By default
 # all members of a group must be documented explicitly.
 
 DISTRIBUTE_GROUP_DOC   = NO
 
 # Set the SUBGROUPING tag to YES (the default) to allow class member groups of
 # the same type (for instance a group of public functions) to be put as a
 # subgroup of that type (e.g. under the Public Functions section). Set it to
 # NO to prevent subgrouping. Alternatively, this can be done per class using
 # the \nosubgrouping command.
 
 SUBGROUPING            = YES
 
 # When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
 # unions are shown inside the group in which they are included (e.g. using
 # @ingroup) instead of on a separate page (for HTML and Man pages) or
 # section (for LaTeX and RTF).
 
 INLINE_GROUPED_CLASSES = NO
 
 # When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
 # unions with only public data fields will be shown inline in the documentation
 # of the scope in which they are defined (i.e. file, namespace, or group
 # documentation), provided this scope is documented. If set to NO (the default),
 # structs, classes, and unions are shown on a separate page (for HTML and Man
 # pages) or section (for LaTeX and RTF).
 
 INLINE_SIMPLE_STRUCTS  = NO
 
 # When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
 # is documented as struct, union, or enum with the name of the typedef. So
 # typedef struct TypeS {} TypeT, will appear in the documentation as a struct
 # with name TypeT. When disabled the typedef will appear as a member of a file,
 # namespace, or class. And the struct will be named TypeS. This can typically
 # be useful for C code in case the coding convention dictates that all compound
 # types are typedef'ed and only the typedef is referenced, never the tag name.
 
 TYPEDEF_HIDES_STRUCT   = NO
 
 # The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
 # determine which symbols to keep in memory and which to flush to disk.
 # When the cache is full, less often used symbols will be written to disk.
 # For small to medium size projects (<1000 input files) the default value is
 # probably good enough. For larger projects a too small cache size can cause
 # doxygen to be busy swapping symbols to and from disk most of the time
 # causing a significant performance penalty.
 # If the system has enough physical memory increasing the cache will improve the
 # performance by keeping more symbols in memory. Note that the value works on
 # a logarithmic scale so increasing the size by one will roughly double the
 # memory usage. The cache size is given by this formula:
 # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
 # corresponding to a cache size of 2^16 = 65536 symbols.
 
 SYMBOL_CACHE_SIZE      = 0
 
 # Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
 # set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
 # their name and scope. Since this can be an expensive process and often the
 # same symbol appear multiple times in the code, doxygen keeps a cache of
 # pre-resolved symbols. If the cache is too small doxygen will become slower.
 # If the cache is too large, memory is wasted. The cache size is given by this
 # formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
 # corresponding to a cache size of 2^16 = 65536 symbols.
 
 LOOKUP_CACHE_SIZE      = 0
 
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
 
 # If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
 # documentation are documented, even if no documentation was available.
 # Private class members and static file members will be hidden unless
 # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
 
 EXTRACT_ALL            = YES
 
 # If the EXTRACT_PRIVATE tag is set to YES all private members of a class
 # will be included in the documentation.
 
 EXTRACT_PRIVATE        = NO
 
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or
-# internal scope will be included in the documentation.
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal scope will be included in the documentation.
 
 EXTRACT_PACKAGE        = NO
 
 # If the EXTRACT_STATIC tag is set to YES all static members of a file
 # will be included in the documentation.
 
 EXTRACT_STATIC         = YES
 
 # If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
 # defined locally in source files will be included in the documentation.
 # If set to NO only classes defined in header files are included.
 
 EXTRACT_LOCAL_CLASSES  = @MITK_DOXYGEN_INTERNAL_DOCS@
 
 # This flag is only useful for Objective-C code. When set to YES local
 # methods, which are defined in the implementation section but not in
 # the interface are included in the documentation.
 # If set to NO (the default) only methods in the interface are included.
 
 EXTRACT_LOCAL_METHODS  = NO
 
 # If this flag is set to YES, the members of anonymous namespaces will be
 # extracted and appear in the documentation as a namespace called
 # 'anonymous_namespace{file}', where file will be replaced with the base
 # name of the file that contains the anonymous namespace. By default
 # anonymous namespaces are hidden.
 
 EXTRACT_ANON_NSPACES   = NO
 
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
 # undocumented members of documented classes, files or namespaces.
 # If set to NO (the default) these members will be included in the
 # various overviews, but no documentation section is generated.
 # This option has no effect if EXTRACT_ALL is enabled.
 
 HIDE_UNDOC_MEMBERS     = NO
 
 # If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
 # undocumented classes that are normally visible in the class hierarchy.
 # If set to NO (the default) these classes will be included in the various
 # overviews. This option has no effect if EXTRACT_ALL is enabled.
 
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
 # friend (class|struct|union) declarations.
 # If set to NO (the default) these declarations will be included in the
 # documentation.
 
 HIDE_FRIEND_COMPOUNDS  = @MITK_DOXYGEN_HIDE_FRIEND_COMPOUNDS@
 
 # If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
 # documentation blocks found inside the body of a function.
 # If set to NO (the default) these blocks will be appended to the
 # function's detailed documentation block.
 
 HIDE_IN_BODY_DOCS      = NO
 
 # The INTERNAL_DOCS tag determines if documentation
 # that is typed after a \internal command is included. If the tag is set
 # to NO (the default) then the documentation will be excluded.
 # Set it to YES to include the internal documentation.
 
 INTERNAL_DOCS          = @MITK_DOXYGEN_INTERNAL_DOCS@
 
 # If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
 # file names in lower-case letters. If set to YES upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
 # and Mac users are advised to set this option to NO.
 
 CASE_SENSE_NAMES       = YES
 
 # If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
 # will show members with their full class and namespace scopes in the
 # documentation. If set to YES the scope will be hidden.
 
 HIDE_SCOPE_NAMES       = NO
 
 # If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
 # will put a list of the files that are included by a file in the documentation
 # of that file.
 
 SHOW_INCLUDE_FILES     = YES
 
 # If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
 # will list include files with double quotes in the documentation
 # rather than with sharp brackets.
 
 FORCE_LOCAL_INCLUDES   = NO
 
 # If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
 # is inserted in the documentation for inline members.
 
 INLINE_INFO            = YES
 
 # If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
 # will sort the (detailed) documentation of file and class members
 # alphabetically by member name. If set to NO the members will appear in
 # declaration order.
 
 SORT_MEMBER_DOCS       = YES
 
 # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
 # brief documentation of file, namespace and class members alphabetically
 # by member name. If set to NO (the default) the members will appear in
 # declaration order.
 
 SORT_BRIEF_DOCS        = NO
 
 # If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
 # will sort the (brief and detailed) documentation of class members so that
 # constructors and destructors are listed first. If set to NO (the default)
 # the constructors will appear in the respective orders defined by
 # SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
 # This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
 # and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
 
 SORT_MEMBERS_CTORS_1ST = NO
 
 # If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
 # hierarchy of group names into alphabetical order. If set to NO (the default)
 # the group names will appear in their defined order.
 
 SORT_GROUP_NAMES       = NO
 
 # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
 # sorted by fully-qualified names, including namespaces. If set to
 # NO (the default), the class list will be sorted only by class name,
 # not including the namespace part.
 # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
 # Note: This option applies only to the class list, not to the
 # alphabetical list.
 
 SORT_BY_SCOPE_NAME     = YES
 
 # If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
 # do proper type resolution of all parameters of a function it will reject a
 # match between the prototype and the implementation of a member function even
 # if there is only one candidate or it is obvious which candidate to choose
 # by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
 # will still accept a match between prototype and implementation in such cases.
 
 STRICT_PROTO_MATCHING  = NO
 
 # The GENERATE_TODOLIST tag can be used to enable (YES) or
 # disable (NO) the todo list. This list is created by putting \todo
 # commands in the documentation.
 
 GENERATE_TODOLIST      = @MITK_DOXYGEN_GENERATE_TODOLIST@
 
 # The GENERATE_TESTLIST tag can be used to enable (YES) or
 # disable (NO) the test list. This list is created by putting \test
 # commands in the documentation.
 
 GENERATE_TESTLIST      = YES
 
 # The GENERATE_BUGLIST tag can be used to enable (YES) or
 # disable (NO) the bug list. This list is created by putting \bug
 # commands in the documentation.
 
 GENERATE_BUGLIST       = @MITK_DOXYGEN_GENERATE_BUGLIST@
 
 # The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
 # disable (NO) the deprecated list. This list is created by putting
 # \deprecated commands in the documentation.
 
 GENERATE_DEPRECATEDLIST= @MITK_DOXYGEN_GENERATE_DEPRECATEDLIST@
 
 # The ENABLED_SECTIONS tag can be used to enable conditional
 # documentation sections, marked by \if sectionname ... \endif.
 
 ENABLED_SECTIONS       = @MITK_DOXYGEN_ENABLED_SECTIONS@
 
 # The MAX_INITIALIZER_LINES tag determines the maximum number of lines
 # the initial value of a variable or macro consists of for it to appear in
 # the documentation. If the initializer consists of more lines than specified
 # here it will be hidden. Use a value of 0 to hide initializers completely.
 # The appearance of the initializer of individual variables and macros in the
 # documentation can be controlled using \showinitializer or \hideinitializer
 # command in the documentation regardless of this setting.
 
 MAX_INITIALIZER_LINES  = 0
 
 # Set the SHOW_USED_FILES tag to NO to disable the list of files generated
 # at the bottom of the documentation of classes and structs. If set to YES the
 # list will mention the files that were used to generate the documentation.
 
 SHOW_USED_FILES        = YES
 
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = NO
-
 # Set the SHOW_FILES tag to NO to disable the generation of the Files page.
 # This will remove the Files entry from the Quick Index and from the
 # Folder Tree View (if specified). The default is YES.
 
 SHOW_FILES             = YES
 
 # Set the SHOW_NAMESPACES tag to NO to disable the generation of the
 # Namespaces page.
 # This will remove the Namespaces entry from the Quick Index
 # and from the Folder Tree View (if specified). The default is YES.
 
 SHOW_NAMESPACES        = YES
 
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that
 # doxygen should invoke to get the current version for each file (typically from
 # the version control system). Doxygen will invoke the program by executing (via
 # popen()) the command <command> <input-file>, where <command> is the value of
 # the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
 # provided by doxygen. Whatever the program writes to standard output
 # is used as the file version. See the manual for examples.
 
 FILE_VERSION_FILTER    =
 
 # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
 # by doxygen. The layout file controls the global structure of the generated
 # output files in an output format independent way. The create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option.
 # You can optionally specify a file name after the option, if omitted
 # DoxygenLayout.xml will be used as the name of the layout file.
 
 LAYOUT_FILE            =
 
 # The CITE_BIB_FILES tag can be used to specify one or more bib files
 # containing the references data. This must be a list of .bib files. The
 # .bib extension is automatically appended if omitted. Using this command
 # requires the bibtex tool to be installed. See also
 # http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
 # of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
 # feature you need bibtex and perl available in the search path.
 
 CITE_BIB_FILES         =
 
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
 # The QUIET tag can be used to turn on/off the messages that are generated
 # by doxygen. Possible values are YES and NO. If left blank NO is used.
 
 QUIET                  = NO
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
 # generated by doxygen. Possible values are YES and NO. If left blank
 # NO is used.
 
 WARNINGS               = YES
 
 # If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
 # for undocumented members. If EXTRACT_ALL is set to YES then this flag will
 # automatically be disabled.
 
 WARN_IF_UNDOCUMENTED   = YES
 
 # If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
 # potential errors in the documentation, such as not documenting some
 # parameters in a documented function, or documenting parameters that
 # don't exist or using markup commands wrongly.
 
 WARN_IF_DOC_ERROR      = YES
 
 # The WARN_NO_PARAMDOC option can be enabled to get warnings for
 # functions that are documented, but have no documentation for their parameters
 # or return value. If set to NO (the default) doxygen will only warn about
 # wrong or incomplete parameter documentation, but not about the absence of
 # documentation.
 
 WARN_NO_PARAMDOC       = NO
 
 # The WARN_FORMAT tag determines the format of the warning messages that
 # doxygen can produce. The string should contain the $file, $line, and $text
 # tags, which will be replaced by the file and line number from which the
 # warning originated and the warning text. Optionally the format may contain
 # $version, which will be replaced by the version of the file (if it could
 # be obtained via FILE_VERSION_FILTER)
 
 WARN_FORMAT            = "$file:$line: $text"
 
 # The WARN_LOGFILE tag can be used to specify a file to which warning
 # and error messages should be written. If left blank the output is written
 # to stderr.
 
 WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 
 # The INPUT tag can be used to specify the files and/or directories that contain
 # documented source files. You may enter file names like "myfile.cpp" or
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
 INPUT                  = @MITK_SOURCE_DIR@ \
                          @MITK_BINARY_DIR@ \
                          @MITK_DOXYGEN_ADDITIONAL_INPUT_DIRS@
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
 # also the default input encoding. Doxygen uses libiconv (or the iconv built
 # into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
 # the list of possible encodings.
 
 INPUT_ENCODING         = UTF-8
 
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
 # and *.h) to filter out the source-files in the directories. If left
 # blank the following patterns are tested:
 # *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
 # *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
 # *.f90 *.f *.for *.vhd *.vhdl
 
 FILE_PATTERNS          = *.h \
                          *.cpp \
                          *.dox \
-                         *.md  \
+                         *.md \
                          *.txx \
                          *.tpp \
                          *.cxx \
                          *.cmake
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories
 # should be searched for input files as well. Possible values are YES and NO.
 # If left blank NO is used.
 
 RECURSIVE              = YES
 
 # The EXCLUDE tag can be used to specify files and/or directories that should be
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
 EXCLUDE                = @MITK_SOURCE_DIR@/Utilities/ann/ \
                          @MITK_SOURCE_DIR@/Utilities/glew/ \
                          @MITK_SOURCE_DIR@/Utilities/ipFunc/ \
                          @MITK_SOURCE_DIR@/Utilities/ipSegmentation/ \
                          @MITK_SOURCE_DIR@/Utilities/KWStyle/ \
                          @MITK_SOURCE_DIR@/Utilities/pic2vtk/ \
                          @MITK_SOURCE_DIR@/Utilities/Poco/ \
                          @MITK_SOURCE_DIR@/Utilities/qtsingleapplication/ \
                          @MITK_SOURCE_DIR@/Utilities/qwt/ \
                          @MITK_SOURCE_DIR@/Utilities/qxt/ \
                          @MITK_SOURCE_DIR@/Utilities/tinyxml/ \
                          @MITK_SOURCE_DIR@/Utilities/vecmath/ \
                          @MITK_SOURCE_DIR@/Applications/PluginGenerator/ \
                          @MITK_SOURCE_DIR@/BlueBerry/ \
+                         @MITK_SOURCE_DIR@/Core/Code/CppMicroServices/README.md \
+                         @MITK_SOURCE_DIR@/Core/Code/CppMicroServices/documentation/snippets/ \
+                         @MITK_SOURCE_DIR@/Core/Code/CppMicroServices/documentation/doxygen/standalone/ \
+                         @MITK_SOURCE_DIR@/Core/Code/CppMicroServices/test/ \
                          @MITK_SOURCE_DIR@/Deprecated/ \
                          @MITK_SOURCE_DIR@/Build/ \
                          @MITK_SOURCE_DIR@/CMake/PackageDepends \
                          @MITK_SOURCE_DIR@/CMake/QBundleTemplate \
                          @MITK_SOURCE_DIR@/CMakeExternals \
                          @MITK_SOURCE_DIR@/Modules/QmitkExt/vtkQtChartHeaders/ \
                          @MITK_BINARY_DIR@/PT/ \
                          @MITK_BINARY_DIR@/GP/ \
+                         @MITK_BINARY_DIR@/Core/Code/CppMicroServices/ \
                          @MITK_DOXYGEN_ADDITIONAL_EXCLUDE_DIRS@
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
 # from the input.
 
 EXCLUDE_SYMLINKS       = NO
 
 # If the value of the INPUT tag contains directories, you can use the
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
 # certain files from those directories. Note that the wildcards are matched
 # against the file with absolute path, so to exclude all test directories
 # for example use the pattern */test/*
 
 EXCLUDE_PATTERNS       = moc_* \
                          Register* \
                          */files.cmake \
                          */.git/* \
+                         *_p.h \
+                         *Private.* \
                          */Snippets/* \
                          */snippets/* \
                          */testing/* \
                          */Testing/* \
                          @MITK_BINARY_DIR@/*.cmake \
                          @MITK_DOXYGEN_EXCLUDE_PATTERNS@
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
 # output. The symbol name can be a fully qualified name, a word, or if the
 # wildcard * is used, a substring. Examples: ANamespace, AClass,
 # AClass::ANamespace, ANamespace::*Test
 
 EXCLUDE_SYMBOLS        =
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or
 # directories that contain example code fragments that are included (see
 # the \include command).
 
 EXAMPLE_PATH           = @MITK_SOURCE_DIR@/Examples/ \
                          @MITK_SOURCE_DIR@/Examples/Tutorial/ \
                          @MITK_SOURCE_DIR@/Examples/QtFreeRender/ \
                          @MITK_SOURCE_DIR@/Core/Code/ \
+                         @MITK_SOURCE_DIR@/Core/Code/CppMicroServices/Documentation/Snippets/ \
                          @MITK_DOXYGEN_OUTPUT_DIR@/html/extension-points/html/ \
                          @MITK_SOURCE_DIR@/Documentation/Snippets/
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
 # and *.h) to filter out the source-files in the directories. If left
 # blank all files are included.
 
 EXAMPLE_PATTERNS       =
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
 # searched for input files to be used with the \include or \dontinclude
 # commands irrespective of the value of the RECURSIVE tag.
 # Possible values are YES and NO. If left blank NO is used.
 
 EXAMPLE_RECURSIVE      = YES
 
 # The IMAGE_PATH tag can be used to specify one or more files or
 # directories that contain image that are included in the documentation (see
 # the \image command).
 
 IMAGE_PATH             = @MITK_SOURCE_DIR@/Documentation/Doxygen/ \
                          @MITK_SOURCE_DIR@/Documentation/Doxygen/Modules/ \
                          @MITK_SOURCE_DIR@/Documentation/Doxygen/Tutorial/ \
                          @MITK_SOURCE_DIR@
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
 # by executing (via popen()) the command <filter> <input-file>, where <filter>
 # is the value of the INPUT_FILTER tag, and <input-file> is the name of an
 # input file. Doxygen will then use the output that the filter program writes
 # to standard output.
 # If FILTER_PATTERNS is specified, this tag will be
 # ignored.
 
 INPUT_FILTER           =
 
 # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
 # basis.
 # Doxygen will compare the file name with each pattern and apply the
 # filter if there is a match.
 # The filters are a list of the form:
 # pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
 # info on how filters are used. If FILTER_PATTERNS is empty or if
 # non of the patterns match the file name, INPUT_FILTER is applied.
 
 FILTER_PATTERNS        = *.cmake=@CMakeDoxygenFilter_EXECUTABLE@
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
 # INPUT_FILTER) will be used to filter the input files when producing source
 # files to browse (i.e. when SOURCE_BROWSER is set to YES).
 
 FILTER_SOURCE_FILES    = NO
 
 # The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
 # pattern. A pattern will override the setting for FILTER_PATTERN (if any)
 # and it is also possible to disable source filtering for a specific pattern
 # using *.ext= (so without naming a filter). This option only has effect when
 # FILTER_SOURCE_FILES is enabled.
 
 FILTER_SOURCE_PATTERNS =
 
 #---------------------------------------------------------------------------
 # configuration options related to source browsing
 #---------------------------------------------------------------------------
 
 # If the SOURCE_BROWSER tag is set to YES then a list of source files will
 # be generated. Documented entities will be cross-referenced with these sources.
 # Note: To get rid of all source code in the generated output, make sure also
 # VERBATIM_HEADERS is set to NO.
 
 SOURCE_BROWSER         = YES
 
 # Setting the INLINE_SOURCES tag to YES will include the body
 # of functions and classes directly in the documentation.
 
 INLINE_SOURCES         = NO
 
 # Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
 # doxygen to hide any special comment blocks from generated source code
 # fragments. Normal C and C++ comments will always remain visible.
 
 STRIP_CODE_COMMENTS    = YES
 
 # If the REFERENCED_BY_RELATION tag is set to YES
 # then for each documented function all documented
 # functions referencing it will be listed.
 
 REFERENCED_BY_RELATION = YES
 
 # If the REFERENCES_RELATION tag is set to YES
 # then for each documented function all documented entities
 # called/used by that function will be listed.
 
 REFERENCES_RELATION    = YES
 
 # If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
 # and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
 # functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
 # link to the source code.
 # Otherwise they will link to the documentation.
 
 REFERENCES_LINK_SOURCE = YES
 
 # If the USE_HTAGS tag is set to YES then the references to source code
 # will point to the HTML generated by the htags(1) tool instead of doxygen
 # built-in source browser. The htags tool is part of GNU's global source
 # tagging system (see http://www.gnu.org/software/global/global.html). You
 # will need version 4.8.6 or higher.
 
 USE_HTAGS              = NO
 
 # If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
 # will generate a verbatim copy of the header file for each class for
 # which an include is specified. Set to NO to disable this.
 
 VERBATIM_HEADERS       = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 
 # If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
 # of all compounds will be generated. Enable this if the project
 # contains a lot of classes, structs, unions or interfaces.
 
 ALPHABETICAL_INDEX     = YES
 
 # If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
 # the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
 # in which this list will be split (can be a number in the range [1..20])
 
 COLS_IN_ALPHA_INDEX    = 3
 
 # In case all classes in a project start with a common prefix, all
 # classes will be put under the same header in the alphabetical index.
 # The IGNORE_PREFIX tag can be used to specify one or more prefixes that
 # should be ignored while generating the index headers.
 
 IGNORE_PREFIX          =
 
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_HTML tag is set to YES (the default) Doxygen will
 # generate HTML output.
 
 GENERATE_HTML          = YES
 
 # The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `html' will be used as the default path.
 
 HTML_OUTPUT            = html
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for
 # each generated HTML page (for example: .htm,.php,.asp). If it is left blank
 # doxygen will generate files with .html extension.
 
 HTML_FILE_EXTENSION    = .html
 
 # The HTML_HEADER tag can be used to specify a personal HTML header for
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard header. Note that when using a custom header you are responsible
 #  for the proper inclusion of any scripts and style sheets that doxygen
 # needs, which is dependent on the configuration options used.
 # It is advised to generate a default header using "doxygen -w html
 # header.html footer.html stylesheet.css YourConfigFile" and then modify
 # that header. Note that the header is subject to change so you typically
 # have to redo this when upgrading to a newer version of doxygen or when
 # changing the value of configuration settings such as GENERATE_TREEVIEW!
 
 HTML_HEADER            =
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard footer.
 
 HTML_FOOTER            =
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
 # style sheet that is used by each HTML page. It can be used to
 # fine-tune the look of the HTML output. If the tag is left blank doxygen
 # will generate a default style sheet. Note that doxygen will try to copy
 # the style sheet file to the HTML output directory, so don't put your own
 # style sheet in the HTML output directory as well, or it will be erased!
 
 HTML_STYLESHEET        = @MITK_DOXYGEN_STYLESHEET@
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
 # that these files will be copied to the base HTML output directory. Use the
 # $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
 # files. In the HTML_STYLESHEET file, use the file name only. Also note that
 # the files will be copied as-is; there are no commands or markers available.
 
 HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
 # Doxygen will adjust the colors in the style sheet and background images
 # according to this color. Hue is specified as an angle on a colorwheel,
 # see http://en.wikipedia.org/wiki/Hue for more information.
 # For instance the value 0 represents red, 60 is yellow, 120 is green,
 # 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
 # The allowed range is 0 to 359.
 
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
 # the colors in the HTML output. For a value of 0 the output will use
 # grayscales only. A value of 255 will produce the most vivid colors.
 
 HTML_COLORSTYLE_SAT    = 100
 
 # The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
 # the luminance component of the colors in the HTML output. Values below
 # 100 gradually make the output lighter, whereas values above 100 make
 # the output darker. The value divided by 100 is the actual gamma applied,
 # so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
 # and 100 does not change the gamma.
 
 HTML_COLORSTYLE_GAMMA  = 80
 
 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
 # page will contain the date and time when the page was generated. Setting
 # this to NO can help when comparing the output of multiple runs.
 
 HTML_TIMESTAMP         = YES
 
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+# page has loaded.
 
 HTML_DYNAMIC_SECTIONS  = @MITK_DOXYGEN_HTML_DYNAMIC_SECTIONS@
 
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
+# entries shown in the various tree structured indices initially; the user
+# can expand and collapse entries dynamically later on. Doxygen will expand
+# the tree to such a level that at most the specified number of entries are
+# visible (unless a fully collapsed tree already exceeds this amount).
+# So setting the number of entries 1 will produce a full collapsed tree by
+# default. 0 is a special value representing an infinite number of entries
+# and will result in a full expanded tree by default.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
 # If the GENERATE_DOCSET tag is set to YES, additional index files
 # will be generated that can be used as input for Apple's Xcode 3
 # integrated development environment, introduced with OSX 10.5 (Leopard).
 # To create a documentation set, doxygen will generate a Makefile in the
 # HTML output directory. Running make will produce the docset in that
 # directory and running "make install" will install the docset in
 # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
 # it at startup.
 # See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
 # for more information.
 
 GENERATE_DOCSET        = NO
 
 # When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
 # feed. A documentation feed provides an umbrella under which multiple
 # documentation sets from a single provider (such as a company or product suite)
 # can be grouped.
 
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 
 # When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
 # should uniquely identify the documentation set bundle. This should be a
 # reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
 # will append .docset to the name.
 
 DOCSET_BUNDLE_ID       = org.doxygen.Project
 
 # When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
 # the documentation publisher. This should be a reverse domain-name style
 # string, e.g. com.mycompany.MyDocSet.documentation.
 
 DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
 
 # The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
 
 DOCSET_PUBLISHER_NAME  = Publisher
 
 # If the GENERATE_HTMLHELP tag is set to YES, additional index files
 # will be generated that can be used as input for tools like the
 # Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
 # of the generated HTML documentation.
 
 GENERATE_HTMLHELP      = NO
 
 # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
 # be used to specify the file name of the resulting .chm file. You
 # can add a path in front of the file if the result should not be
 # written to the html output directory.
 
 CHM_FILE               =
 
 # If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
 # be used to specify the location (absolute path including file name) of
 # the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
 # the HTML help compiler on the generated index.hhp.
 
 HHC_LOCATION           =
 
 # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
 # controls if a separate .chi index file is generated (YES) or that
 # it should be included in the master .chm file (NO).
 
 GENERATE_CHI           = NO
 
 # If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
 # is used to encode HtmlHelp index (hhk), content (hhc) and project file
 # content.
 
 CHM_INDEX_ENCODING     =
 
 # If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
 # controls whether a binary table of contents is generated (YES) or a
 # normal table of contents (NO) in the .chm file.
 
 BINARY_TOC             = NO
 
 # The TOC_EXPAND flag can be set to YES to add extra items for group members
 # to the contents of the HTML help documentation and to the tree view.
 
 TOC_EXPAND             = NO
 
 # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
 # QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
 # that can be used as input for Qt's qhelpgenerator to generate a
 # Qt Compressed Help (.qch) of the generated HTML documentation.
 
 GENERATE_QHP           = @MITK_DOXYGEN_GENERATE_QHP@
 
 # If the QHG_LOCATION tag is specified, the QCH_FILE tag can
 # be used to specify the file name of the resulting .qch file.
 # The path specified is relative to the HTML output folder.
 
 QCH_FILE               = @MITK_DOXYGEN_QCH_FILE@
 
 # The QHP_NAMESPACE tag specifies the namespace to use when generating
 # Qt Help Project output. For more information please see
 # http://doc.trolltech.com/qthelpproject.html#namespace
 
 QHP_NAMESPACE          = "org.mitk"
 
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
 # Qt Help Project output. For more information please see
 # http://doc.trolltech.com/qthelpproject.html#virtual-folders
 
 QHP_VIRTUAL_FOLDER     = MITK
 
 # If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
 # add. For more information please see
 # http://doc.trolltech.com/qthelpproject.html#custom-filters
 
 QHP_CUST_FILTER_NAME   =
 
 # The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
 # custom filter to add. For more information please see
 # <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
 # Qt Help Project / Custom Filters</a>.
 
 QHP_CUST_FILTER_ATTRS  =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
 # project's
 # filter section matches.
 # <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
 # Qt Help Project / Filter Attributes</a>.
 
 QHP_SECT_FILTER_ATTRS  =
 
 # If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
 # be used to specify the location of Qt's qhelpgenerator.
 # If non-empty doxygen will try to run qhelpgenerator on the generated
 # .qhp file.
 
 QHG_LOCATION           = @QT_HELPGENERATOR_EXECUTABLE@
 
 # If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
 #  will be generated, which together with the HTML files, form an Eclipse help
 # plugin. To install this plugin and make it available under the help contents
 # menu in Eclipse, the contents of the directory containing the HTML and XML
 # files needs to be copied into the plugins directory of eclipse. The name of
 # the directory within the plugins directory should be the same as
 # the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
 # the help appears.
 
 GENERATE_ECLIPSEHELP   = NO
 
 # A unique identifier for the eclipse help plugin. When installing the plugin
 # the directory name containing the HTML and XML files should also have
 # this name.
 
 ECLIPSE_DOC_ID         = org.doxygen.Project
 
 # The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
 # at top of each HTML page. The value NO (the default) enables the index and
 # the value YES disables it. Since the tabs have the same information as the
 # navigation tree you can set this option to NO if you already set
 # GENERATE_TREEVIEW to YES.
 
 DISABLE_INDEX          = NO
 
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
 # structure should be generated to display hierarchical information.
 # If the tag value is set to YES, a side panel will be generated
 # containing a tree-like index structure (just like the one that
 # is generated for HTML Help). For this to work a browser that supports
 # JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
 # Windows users are probably better off using the HTML help feature.
 # Since the tree basically has the same information as the tab index you
 # could consider to set DISABLE_INDEX to NO when enabling this option.
 
 GENERATE_TREEVIEW      = YES
 
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
 # (range [0,1..20]) that doxygen will group on one line in the generated HTML
 # documentation. Note that a value of 0 will completely suppress the enum
 # values from appearing in the overview section.
 
 ENUM_VALUES_PER_LINE   = 4
 
-# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
-# and Class Hierarchy pages using a tree view instead of an ordered list.
-
-USE_INLINE_TREES       = NO
-
 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
 # used to set the initial width (in pixels) of the frame in which the tree
 # is shown.
 
 TREEVIEW_WIDTH         = 300
 
 # When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
 # links to external symbols imported via tag files in a separate window.
 
 EXT_LINKS_IN_WINDOW    = NO
 
 # Use this tag to change the font size of Latex formulas included
 # as images in the HTML documentation. The default is 10. Note that
 # when you change the font size after a successful doxygen run you need
 # to manually remove any form_*.png images from the HTML output directory
 # to force them to be regenerated.
 
 FORMULA_FONTSIZE       = 10
 
 # Use the FORMULA_TRANPARENT tag to determine whether or not the images
 # generated for formulas are transparent PNGs. Transparent PNGs are
 # not supported properly for IE 6.0, but are supported on all modern browsers.
 # Note that when changing this option you need to delete any form_*.png files
 # in the HTML output before the changes have effect.
 
 FORMULA_TRANSPARENT    = YES
 
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
 # (see http://www.mathjax.org) which uses client side Javascript for the
 # rendering instead of using prerendered bitmaps. Use this if you do not
 # have LaTeX installed or if you want to formulas look prettier in the HTML
 # output. When enabled you may also need to install MathJax separately and
 # configure the path to it using the MATHJAX_RELPATH option.
 
 USE_MATHJAX            = NO
 
 # When MathJax is enabled you need to specify the location relative to the
 # HTML output directory using the MATHJAX_RELPATH option. The destination
 # directory should contain the MathJax.js script. For instance, if the mathjax
 # directory is located at the same level as the HTML output directory, then
 # MATHJAX_RELPATH should be ../mathjax. The default value points to
 # the MathJax Content Delivery Network so you can quickly see the result without
 # installing MathJax.
 # However, it is strongly recommended to install a local
 # copy of MathJax from http://www.mathjax.org before deployment.
 
 MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
 # names that should be enabled during MathJax rendering.
 
 MATHJAX_EXTENSIONS     =
 
 # When the SEARCHENGINE tag is enabled doxygen will generate a search box
 # for the HTML output. The underlying search engine uses javascript
 # and DHTML and should work on any modern browser. Note that when using
 # HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
 # (GENERATE_DOCSET) there is already a search function so this one should
 # typically be disabled. For large projects the javascript based search engine
 # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
 
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
 # implemented using a PHP enabled web server instead of at the web client
 # using Javascript. Doxygen will generate the search PHP script and index
 # file to put on the web server. The advantage of the server
 # based approach is that it scales better to large projects and allows
 # full text search. The disadvantages are that it is more difficult to setup
 # and does not have live searching capabilities.
 
 SERVER_BASED_SEARCH    = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
 # generate Latex output.
 
 GENERATE_LATEX         = NO
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `latex' will be used as the default path.
 
 LATEX_OUTPUT           = latex
 
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
 # invoked. If left blank `latex' will be used as the default command name.
 # Note that when enabling USE_PDFLATEX this option is only used for
 # generating bitmaps for formulas in the HTML output, but not in the
 # Makefile that is written to the output directory.
 
 LATEX_CMD_NAME         = latex
 
 # The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
 # generate index for LaTeX. If left blank `makeindex' will be used as the
 # default command name.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
 # If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
 # LaTeX documents. This may be useful for small projects and may help to
 # save some trees in general.
 
 COMPACT_LATEX          = NO
 
 # The PAPER_TYPE tag can be used to set the paper type that is used
 # by the printer. Possible values are: a4, letter, legal and
 # executive. If left blank a4wide will be used.
 
 PAPER_TYPE             = a4wide
 
 # The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
 # packages that should be included in the LaTeX output.
 
 EXTRA_PACKAGES         = amssymb
 
 # The LATEX_HEADER tag can be used to specify a personal LaTeX header for
 # the generated latex document. The header should contain everything until
 # the first chapter. If it is left blank doxygen will generate a
 # standard header. Notice: only use this tag if you know what you are doing!
 
 LATEX_HEADER           =
 
 # The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
 # the generated latex document. The footer should contain everything after
 # the last chapter. If it is left blank doxygen will generate a
 # standard footer. Notice: only use this tag if you know what you are doing!
 
 LATEX_FOOTER           =
 
 # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
 # is prepared for conversion to pdf (using ps2pdf). The pdf file will
 # contain links (just like the HTML output) instead of page references
 # This makes the output suitable for online browsing using a pdf viewer.
 
 PDF_HYPERLINKS         = NO
 
 # If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
 # plain latex in the generated Makefile. Set this option to YES to get a
 # higher quality PDF documentation.
 
 USE_PDFLATEX           = NO
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
 # command to the generated LaTeX files. This will instruct LaTeX to keep
 # running if errors occur, instead of asking the user for help.
 # This option is also used when generating formulas in HTML.
 
 LATEX_BATCHMODE        = NO
 
 # If LATEX_HIDE_INDICES is set to YES then doxygen will not
 # include the index chapters (such as File Index, Compound Index, etc.)
 # in the output.
 
 LATEX_HIDE_INDICES     = NO
 
 # If LATEX_SOURCE_CODE is set to YES then doxygen will include
 # source code with syntax highlighting in the LaTeX output.
 # Note that which sources are shown also depends on other settings
 # such as SOURCE_BROWSER.
 
 LATEX_SOURCE_CODE      = NO
 
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
 # http://en.wikipedia.org/wiki/BibTeX for more info.
 
 LATEX_BIB_STYLE        = plain
 
 #---------------------------------------------------------------------------
 # configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
 # The RTF output is optimized for Word 97 and may not look very pretty with
 # other RTF readers or editors.
 
 GENERATE_RTF           = NO
 
 # The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `rtf' will be used as the default path.
 
 RTF_OUTPUT             = rtf
 
 # If the COMPACT_RTF tag is set to YES Doxygen generates more compact
 # RTF documents. This may be useful for small projects and may help to
 # save some trees in general.
 
 COMPACT_RTF            = NO
 
 # If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
 # will contain hyperlink fields. The RTF file will
 # contain links (just like the HTML output) instead of page references.
 # This makes the output suitable for online browsing using WORD or other
 # programs which support those fields.
 # Note: wordpad (write) and others do not support links.
 
 RTF_HYPERLINKS         = NO
 
 # Load style sheet definitions from file. Syntax is similar to doxygen's
 # config file, i.e. a series of assignments. You only have to provide
 # replacements, missing definitions are set to their default value.
 
 RTF_STYLESHEET_FILE    =
 
 # Set optional variables used in the generation of an rtf document.
 # Syntax is similar to doxygen's config file.
 
 RTF_EXTENSIONS_FILE    =
 
 #---------------------------------------------------------------------------
 # configuration options related to the man page output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_MAN tag is set to YES (the default) Doxygen will
 # generate man pages
 
 GENERATE_MAN           = NO
 
 # The MAN_OUTPUT tag is used to specify where the man pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `man' will be used as the default path.
 
 MAN_OUTPUT             = man
 
 # The MAN_EXTENSION tag determines the extension that is added to
 # the generated man pages (default is the subroutine's section .3)
 
 MAN_EXTENSION          = .3
 
 # If the MAN_LINKS tag is set to YES and Doxygen generates man output,
 # then it will generate one additional man file for each entity
 # documented in the real man page(s). These additional files
 # only source the real man page, but without them the man command
 # would be unable to find the correct page. The default is NO.
 
 MAN_LINKS              = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the XML output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_XML tag is set to YES Doxygen will
 # generate an XML file that captures the structure of
 # the code including all documentation.
 
 GENERATE_XML           = NO
 
 # The XML_OUTPUT tag is used to specify where the XML pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `xml' will be used as the default path.
 
 XML_OUTPUT             = xml
 
 # The XML_SCHEMA tag can be used to specify an XML schema,
 # which can be used by a validating XML parser to check the
 # syntax of the XML files.
 
 XML_SCHEMA             =
 
 # The XML_DTD tag can be used to specify an XML DTD,
 # which can be used by a validating XML parser to check the
 # syntax of the XML files.
 
 XML_DTD                =
 
 # If the XML_PROGRAMLISTING tag is set to YES Doxygen will
 # dump the program listings (including syntax highlighting
 # and cross-referencing information) to the XML output. Note that
 # enabling this will significantly increase the size of the XML output.
 
 XML_PROGRAMLISTING     = YES
 
 #---------------------------------------------------------------------------
 # configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
 # generate an AutoGen Definitions (see autogen.sf.net) file
 # that captures the structure of the code including all
 # documentation. Note that this feature is still experimental
 # and incomplete at the moment.
 
 GENERATE_AUTOGEN_DEF   = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_PERLMOD tag is set to YES Doxygen will
 # generate a Perl module file that captures the structure of
 # the code including all documentation. Note that this
 # feature is still experimental and incomplete at the
 # moment.
 
 GENERATE_PERLMOD       = NO
 
 # If the PERLMOD_LATEX tag is set to YES Doxygen will generate
 # the necessary Makefile rules, Perl scripts and LaTeX code to be able
 # to generate PDF and DVI output from the Perl module output.
 
 PERLMOD_LATEX          = NO
 
 # If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
 # nicely formatted so it can be parsed by a human reader.
 # This is useful
 # if you want to understand what is going on.
 # On the other hand, if this
 # tag is set to NO the size of the Perl module output will be much smaller
 # and Perl will parse it just the same.
 
 PERLMOD_PRETTY         = YES
 
 # The names of the make variables in the generated doxyrules.make file
 # are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
 # This is useful so different doxyrules.make files included by the same
 # Makefile don't overwrite each other's variables.
 
 PERLMOD_MAKEVAR_PREFIX =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
 # If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
 # evaluate all C-preprocessor directives found in the sources and include
 # files.
 
 ENABLE_PREPROCESSING   = YES
 
 # If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
 # names in the source code. If set to NO (the default) only conditional
 # compilation will be performed. Macro expansion can be done in a controlled
 # way by setting EXPAND_ONLY_PREDEF to YES.
 
 MACRO_EXPANSION        = YES
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
 # then the macro expansion is limited to the macros specified with the
 # PREDEFINED and EXPAND_AS_DEFINED tags.
 
 EXPAND_ONLY_PREDEF     = NO
 
 # If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
 # pointed to by INCLUDE_PATH will be searched when a #include is found.
 
 SEARCH_INCLUDES        = YES
 
 # The INCLUDE_PATH tag can be used to specify one or more directories that
 # contain include files that are not input files but should be processed by
 # the preprocessor.
 
 INCLUDE_PATH           =
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the
 # directories. If left blank, the patterns specified with FILE_PATTERNS will
 # be used.
 
 INCLUDE_FILE_PATTERNS  =
 
 # The PREDEFINED tag can be used to specify one or more macro names that
 # are defined before the preprocessor is started (similar to the -D option of
 # gcc). The argument of the tag is a list of macros of the form: name
 # or name=definition (no spaces). If the definition and the = are
 # omitted =1 is assumed. To prevent a macro definition from being
 # undefined via #undef or recursively expanded use the := operator
 # instead of the = operator.
 
 PREDEFINED             = itkNotUsed(x)= \
                          "itkSetMacro(name,type)=                   virtual void Set##name (type _arg);" \
                          "itkGetMacro(name,type)=                   virtual type Get##name ();" \
                          "itkGetConstMacro(name,type)=                   virtual type Get##name () const;" \
                          "itkSetStringMacro(name)=                   virtual void Set##name (const char* _arg);" \
                          "itkGetStringMacro(name)=                   virtual const char* Get##name () const;" \
                          "itkSetClampMacro(name,type,min,max)=                   virtual void Set##name (type _arg);" \
                          "itkSetObjectMacro(name,type)=                   virtual void Set##name (type* _arg);" \
                          "itkGetObjectMacro(name,type)=                   virtual type* Get##name ();" \
                          "itkSetConstObjectMacro(name,type)=                   virtual void Set##name ( const type* _arg);" \
                          "itkGetConstObjectMacro(name,type)=                   virtual const type* Get##name ();" \
                          "itkGetConstReferenceMacro(name,type)=                   virtual const type& Get##name ();" \
                          "itkGetConstReferenceObjectMacro(name,type)=                   virtual const type::Pointer& Get##name () const;" \
                          "itkBooleanMacro(name)=                   virtual void name##On ();                   virtual void name##Off ();" \
                          "itkSetVector2Macro(name,type)=                   virtual void Set##name (type _arg1, type _arg2)                   virtual void Set##name (type _arg[2]);" \
                          "itkGetVector2Macro(name,type)=                   virtual type* Get##name () const;                   virtual void Get##name (type& _arg1, type& _arg2) const;                   virtual void Get##name (type _arg[2]) const;" \
                          "itkSetVector3Macro(name,type)=                   virtual void Set##name (type _arg1, type _arg2, type _arg3)                   virtual void Set##name (type _arg[3]);" \
                          "itkGetVector3Macro(name,type)=                   virtual type* Get##name () const;                   virtual void Get##name (type& _arg1, type& _arg2, type& _arg3) const;                   virtual void Get##name (type _arg[3]) const;" \
                          "itkSetVector4Macro(name,type)=                   virtual void Set##name (type _arg1, type _arg2, type _arg3, type _arg4)                   virtual void Set##name (type _arg[4]);" \
                          "itkGetVector4Macro(name,type)=                   virtual type* Get##name () const;                   virtual void Get##name (type& _arg1, type& _arg2, type& _arg3, type& _arg4) const;                   virtual void Get##name (type _arg[4]) const;" \
                          "itkSetVector6Macro(name,type)=                   virtual void Set##name (type _arg1, type _arg2, type _arg3, type _arg4, type _arg5, type _arg6)                   virtual void Set##name (type _arg[6]);" \
                          "itkGetVector6Macro(name,type)=                   virtual type* Get##name () const;                   virtual void Get##name (type& _arg1, type& _arg2, type& _arg3, type& _arg4, type& _arg5, type& _arg6) const;                   virtual void Get##name (type _arg[6]) const;" \
                          "itkSetVectorMacro(name,type,count)=                   virtual void Set##name(type data[]);" \
                          "itkGetVectorMacro(name,type,count)=                   virtual type* Get##name () const;" \
                          "itkNewMacro(type)=                   static Pointer New();" \
                          "itkTypeMacro(thisClass,superclass)=                   virtual const char *GetClassName() const;" \
                          "itkConceptMacro(name,concept)=                   enum { name = 0 };" \
                          "ITK_NUMERIC_LIMITS=                   std::numeric_limits" \
                          "ITK_TYPENAME=                   typename" \
                          "FEM_ABSTRACT_CLASS(thisClass,parentClass)=                   public:                                                                   /** Standard Self typedef.*/                                          typedef thisClass Self;                                                 /** Standard Superclass typedef. */                                   typedef parentClass Superclass;                                         /** Pointer or SmartPointer to an object. */                            typedef Self* Pointer;                                                  /** Const pointer or SmartPointer to an object. */                      typedef const Self* ConstPointer;                                     private:" \
                          "FEM_CLASS(thisClass,parentClass)=                   FEM_ABSTRACT_CLASS(thisClass,parentClass)                               public:                                                                   /** Create a new object from the existing one  */                       virtual Baseclass::Pointer Clone() const;                               /** Class ID for FEM object factory */                                  static const int CLID;                                                  /** Virtual function to access the class ID */                          virtual int ClassID() const                                               { return CLID; }                                                      /** Object creation in an itk compatible way */                         static Self::Pointer New()                                                { return new Self(); }                                              private:" \
                          FREEVERSION \
                          ERROR_CHECKING \
                          HAS_TIFF \
                          HAS_JPEG \
                          HAS_NETLIB \
                          HAS_PNG \
                          HAS_ZLIB \
                          HAS_GLUT \
                          HAS_QT \
                          VCL_USE_NATIVE_STL=1 \
                          VCL_USE_NATIVE_COMPLEX=1 \
                          VCL_HAS_BOOL=1 \
                          VXL_BIG_ENDIAN=1 \
                          VXL_LITTLE_ENDIAN=0 \
                          VNL_DLL_DATA= \
                          size_t=vcl_size_t \
-                         DOXYGEN_SKIP
+                         "US_PREPEND_NAMESPACE(x)=mitk::x" \
+                         "US_BEGIN_NAMESPACE= namespace mitk {" \
+                         "US_END_NAMESPACE=}" \
+                         "US_BASECLASS_NAME=itk::LightObject" \
+                         US_EXPORT=
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
 # this tag can be used to specify a list of macro names that should be expanded.
 # The macro definition that is found in the sources will be used.
 # Use the PREDEFINED tag if you want to use a different macro definition that
 # overrules the definition found in the source code.
 
 EXPAND_AS_DEFINED      =
 
 # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
 # doxygen's preprocessor will remove all references to function-like macros
 # that are alone on a line, have an all uppercase name, and do not end with a
 # semicolon, because these will confuse the parser if not removed.
 
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
 # The TAGFILES option can be used to specify one or more tagfiles. For each
 # tag file the location of the external documentation should be added. The
 # format of a tag file without this location is as follows:
 #
 # TAGFILES = file1 file2 ...
 # Adding location for the tag files is done as follows:
 #
 # TAGFILES = file1=loc1 "file2 = loc2" ...
 # where "loc1" and "loc2" can be relative or absolute paths
 # or URLs. Note that each tag file must have a unique name (where the name does
 # NOT include the path). If a tag file is not located in the directory in which
 # doxygen is run, you must also specify the path to the tagfile here.
 
 TAGFILES               = @BLUEBERRY_DOXYGEN_TAGFILE@
 
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create
 # a tag file that is based on the input files it reads.
 
 GENERATE_TAGFILE       = @MITK_DOXYGEN_TAGFILE_NAME@
 
 # If the ALLEXTERNALS tag is set to YES all external classes will be listed
 # in the class index. If set to NO only the inherited external classes
 # will be listed.
 
 ALLEXTERNALS           = NO
 
 # If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
 # in the modules index. If set to NO, only the current project's groups will
 # be listed.
 
 EXTERNAL_GROUPS        = NO
 
 # The PERL_PATH should be the absolute path and name of the perl script
 # interpreter (i.e. the result of `which perl').
 
 PERL_PATH              = /usr/bin/perl
 
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
 # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
 # generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
 # or super classes. Setting the tag to NO turns the diagrams off. Note that
 # this option also works with HAVE_DOT disabled, but it is recommended to
 # install and use dot, since it yields more powerful graphs.
 
 CLASS_DIAGRAMS         = YES
 
 # You can define message sequence charts within doxygen comments using the \msc
 # command. Doxygen will then run the mscgen tool (see
 # http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
 # documentation. The MSCGEN_PATH tag allows you to specify the directory where
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
 MSCGEN_PATH            =
 
 # If set to YES, the inheritance and collaboration graphs will hide
 # inheritance and usage relations if the target is undocumented
 # or is not a class.
 
 HIDE_UNDOC_RELATIONS   = YES
 
 # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
 # available from the path. This tool is part of Graphviz, a graph visualization
 # toolkit from AT&T and Lucent Bell Labs. The other options in this section
 # have no effect if this option is set to NO (the default)
 
 HAVE_DOT               = @HAVE_DOT@
 
 # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
 # allowed to run in parallel. When set to 0 (the default) doxygen will
 # base this on the number of processors available in the system. You can set it
 # explicitly to a value larger than 0 to get control over the balance
 # between CPU load and processing speed.
 
 DOT_NUM_THREADS        = @MITK_DOXYGEN_DOT_NUM_THREADS@
 
 # By default doxygen will use the Helvetica font for all dot files that
 # doxygen generates. When you want a differently looking font you can specify
 # the font name using DOT_FONTNAME. You need to make sure dot is able to find
 # the font, which can be done by putting it in a standard location or by setting
 # the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
 # directory containing the font.
 
 DOT_FONTNAME           = FreeSans.ttf
 
 # The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
 # The default size is 10pt.
 
 DOT_FONTSIZE           = 10
 
 # By default doxygen will tell dot to use the Helvetica font.
 # If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
 # set the path where dot can find it.
 
 DOT_FONTPATH           =
 
 # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
 # will generate a graph for each documented class showing the direct and
 # indirect inheritance relations. Setting this tag to YES will force the
 # CLASS_DIAGRAMS tag to NO.
 
 CLASS_GRAPH            = YES
 
 # If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
 # will generate a graph for each documented class showing the direct and
 # indirect implementation dependencies (inheritance, containment, and
 # class references variables) of the class with other documented classes.
 
 COLLABORATION_GRAPH    = YES
 
 # If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
 # will generate a graph for groups, showing the direct groups dependencies
 
 GROUP_GRAPHS           = YES
 
 # If the UML_LOOK tag is set to YES doxygen will generate inheritance and
 # collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
 
 UML_LOOK               = @MITK_DOXYGEN_UML_LOOK@
 
 # If the UML_LOOK tag is enabled, the fields and methods are shown inside
 # the class node. If there are many fields or methods and many nodes the
 # graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
 # threshold limits the number of items for each type to make the size more
 # managable. Set this to 0 for no limit. Note that the threshold may be
 # exceeded by 50% before the limit is enforced.
 
 UML_LIMIT_NUM_FIELDS   = 10
 
 # If set to YES, the inheritance and collaboration graphs will show the
 # relations between templates and their instances.
 
 TEMPLATE_RELATIONS     = YES
 
 # If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
 # tags are set to YES then doxygen will generate a graph for each documented
 # file showing the direct and indirect include dependencies of the file with
 # other documented files.
 
 INCLUDE_GRAPH          = NO
 
 # If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
 # HAVE_DOT tags are set to YES then doxygen will generate a graph for each
 # documented header file showing the documented files that directly or
 # indirectly include this file.
 
 INCLUDED_BY_GRAPH      = NO
 
 # If the CALL_GRAPH and HAVE_DOT options are set to YES then
 # doxygen will generate a call dependency graph for every global function
 # or class method. Note that enabling this option will significantly increase
 # the time of a run. So in most cases it will be better to enable call graphs
 # for selected functions only using the \callgraph command.
 
 CALL_GRAPH             = NO
 
 # If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
 # doxygen will generate a caller dependency graph for every global function
 # or class method. Note that enabling this option will significantly increase
 # the time of a run. So in most cases it will be better to enable caller
 # graphs for selected functions only using the \callergraph command.
 
 CALLER_GRAPH           = NO
 
 # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
 # will generate a graphical hierarchy of all classes instead of a textual one.
 
 GRAPHICAL_HIERARCHY    = NO
 
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
 # then doxygen will show the dependencies a directory has on other directories
 # in a graphical way. The dependency relations are determined by the #include
 # relations between the files in the directories.
 
 DIRECTORY_GRAPH        = YES
 
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
 # generated by dot. Possible values are svg, png, jpg, or gif.
 # If left blank png will be used. If you choose svg you need to set
 # HTML_FILE_EXTENSION to xhtml in order to make the SVG files
 # visible in IE 9+ (other browsers do not have this requirement).
 
 DOT_IMAGE_FORMAT       = png
 
 # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
 # enable generation of interactive SVG images that allow zooming and panning.
 # Note that this requires a modern browser other than Internet Explorer.
 # Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
 # need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
 # visible. Older versions of IE do not have SVG support.
 
 INTERACTIVE_SVG        = NO
 
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found in the path.
 
 DOT_PATH               = @DOXYGEN_DOT_PATH@
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that
 # contain dot files that are included in the documentation (see the
 # \dotfile command).
 
 DOTFILE_DIRS           =
 
 # The MSCFILE_DIRS tag can be used to specify one or more directories that
 # contain msc files that are included in the documentation (see the
 # \mscfile command).
 
 MSCFILE_DIRS           =
 
 # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
 # nodes that will be shown in the graph. If the number of nodes in a graph
 # becomes larger than this value, doxygen will truncate the graph, which is
 # visualized by representing a node as a red box. Note that doxygen if the
 # number of direct children of the root node in a graph is already larger than
 # DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
 # that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
 
 DOT_GRAPH_MAX_NODES    = 50
 
 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
 # graphs generated by dot. A depth value of 3 means that only nodes reachable
 # from the root by following a path via at most 3 edges will be shown. Nodes
 # that lay further from the root node will be omitted. Note that setting this
 # option to 1 or 2 may greatly reduce the computation time needed for large
 # code bases. Also note that the size of a graph can be further restricted by
 # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
 # background. This is disabled by default, because dot on Windows does not
 # seem to support this out of the box. Warning: Depending on the platform used,
 # enabling this option may lead to badly anti-aliased labels on the edges of
 # a graph (i.e. they become hard to read).
 
 DOT_TRANSPARENT        = NO
 
 # Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This
 # makes dot run faster, but since only newer versions of dot (>1.8.10)
 # support this, this feature is disabled by default.
 
 DOT_MULTI_TARGETS      = NO
 
 # If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
 # generate a legend page explaining the meaning of the various boxes and
 # arrows in the dot generated graphs.
 
 GENERATE_LEGEND        = YES
 
 # If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
 # remove the intermediate dot files that are used to generate
 # the various graphs.
 
 DOT_CLEANUP            = YES
diff --git a/Documentation/mitk_doxygen.css b/Documentation/mitk_doxygen.css
index 8d49f5c166..3f74083669 100644
--- a/Documentation/mitk_doxygen.css
+++ b/Documentation/mitk_doxygen.css
@@ -1,1010 +1,1195 @@
 /* The standard CSS for doxygen */
 
 body, table, div, p, dl {
-	font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif;
-	font-size: 12px;
+  font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif;
+  font-size: 13px;
+  line-height: 1.3;
 }
 
 /* @group Heading Levels */
 
 h1 {
-	font-size: 150%;
+  font-size: 150%;
 }
 
 .title {
-	font-size: 150%;
-	font-weight: bold;
-	margin: 10px 2px;
+  font-size: 150%;
+  font-weight: bold;
+  margin: 10px 2px;
 }
 
 h2 {
-	font-size: 120%;
+  font-size: 120%;
 }
 
 h3 {
-	font-size: 100%;
+  font-size: 100%;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  -webkit-transition: text-shadow 0.5s linear;
+  -moz-transition: text-shadow 0.5s linear;
+  -ms-transition: text-shadow 0.5s linear;
+  -o-transition: text-shadow 0.5s linear;
+  transition: text-shadow 0.5s linear;
+  margin-right: 15px;
+}
+
+h1.glow, h2.glow, h3.glow, h4.glow, h5.glow, h6.glow {
+  text-shadow: 0 0 15px cyan;
 }
 
 dt {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 div.multicol {
-	-moz-column-gap: 1em;
-	-webkit-column-gap: 1em;
-	-moz-column-count: 3;
-	-webkit-column-count: 3;
+  -moz-column-gap: 1em;
+  -webkit-column-gap: 1em;
+  -moz-column-count: 3;
+  -webkit-column-count: 3;
 }
 
 p.startli, p.startdd, p.starttd {
-	margin-top: 2px;
+  margin-top: 2px;
 }
 
 p.endli {
-	margin-bottom: 0px;
+  margin-bottom: 0px;
 }
 
 p.enddd {
-	margin-bottom: 4px;
+  margin-bottom: 4px;
 }
 
 p.endtd {
-	margin-bottom: 2px;
+  margin-bottom: 2px;
 }
 
 /* @end */
 
 caption {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 span.legend {
         font-size: 70%;
         text-align: center;
 }
 
 h3.version {
         font-size: 90%;
         text-align: center;
 }
 
 div.qindex, div.navtab{
-	background-color: #EBEFF6;
-	border: 1px solid #A3B4D7;
-	text-align: center;
+  background-color: #EBEFF6;
+  border: 1px solid #A3B4D7;
+  text-align: center;
 }
 
 div.qindex, div.navpath {
-	width: 100%;
-	line-height: 140%;
+  width: 100%;
+  line-height: 140%;
 }
 
 div.navtab {
-	margin-right: 15px;
+  margin-right: 15px;
 }
 
 /* @group Link Styling */
 
 a {
-	color: #3D578C;
-	font-weight: normal;
-	text-decoration: none;
+  color: #3D578C;
+  font-weight: normal;
+  text-decoration: none;
 }
 
 .contents a:visited {
-	color: #4665A2;
+  color: #4665A2;
 }
 
 a:hover {
-	text-decoration: underline;
+  text-decoration: underline;
 }
 
 a.qindex {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 a.qindexHL {
-	font-weight: bold;
-	background-color: #9CAFD4;
-	color: #ffffff;
-	border: 1px double #869DCA;
+  font-weight: bold;
+  background-color: #9CAFD4;
+  color: #ffffff;
+  border: 1px double #869DCA;
 }
 
 .contents a.qindexHL:visited {
         color: #ffffff;
 }
 
 a.el {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 a.elRef {
 }
 
-a.code {
-	color: #4665A2;
+a.code, a.code:visited {
+  color: #4665A2; 
 }
 
-a.codeRef {
-	color: #4665A2;
+a.codeRef, a.codeRef:visited {
+  color: #4665A2; 
 }
 
 /* @end */
 
 dl.el {
-	margin-left: -1cm;
-}
-
-.fragment {
-	font-family: monospace, fixed;
-	font-size: 105%;
+  margin-left: -1cm;
 }
 
 pre.fragment {
-	border: 1px solid #C4CFE5;
-	background-color: #FBFCFD;
-	padding: 4px 6px;
-	margin: 4px 8px 4px 2px;
-	overflow: auto;
-	word-wrap: break-word;
-	font-size:  9pt;
-	line-height: 125%;
+        border: 1px solid #C4CFE5;
+        background-color: #FBFCFD;
+        padding: 4px 6px;
+        margin: 4px 8px 4px 2px;
+        overflow: auto;
+        word-wrap: break-word;
+        font-size:  9pt;
+        line-height: 125%;
+        font-family: monospace, fixed;
+        font-size: 105%;
+}
+
+div.fragment {
+        padding: 4px;
+        margin: 4px;
+  background-color: #FBFCFD;
+  border: 1px solid #C4CFE5;
+}
+
+div.line {
+  font-family: monospace, fixed;
+        font-size: 13px;
+  min-height: 13px;
+  line-height: 1.0;
+  text-wrap: unrestricted;
+  white-space: -moz-pre-wrap; /* Moz */
+  white-space: -pre-wrap;     /* Opera 4-6 */
+  white-space: -o-pre-wrap;   /* Opera 7 */
+  white-space: pre-wrap;      /* CSS3  */
+  word-wrap: break-word;      /* IE 5.5+ */
+  text-indent: -53px;
+  padding-left: 53px;
+  padding-bottom: 0px;
+  margin: 0px;
+}
+
+span.lineno {
+  padding-right: 4px;
+  text-align: right;
+  border-right: 2px solid #0F0;
+  background-color: #E8E8E8;
+        white-space: pre;
+}
+span.lineno a {
+  background-color: #D8D8D8;
+}
+
+span.lineno a:hover {
+  background-color: #C8C8C8;
 }
 
 div.ah {
-	background-color: black;
-	font-weight: bold;
-	color: #ffffff;
-	margin-bottom: 3px;
-	margin-top: 3px;
-	padding: 0.2em;
-	border: solid thin #333;
-	border-radius: 0.5em;
-	-webkit-border-radius: .5em;
-	-moz-border-radius: .5em;
-	box-shadow: 2px 2px 3px #999;
-	-webkit-box-shadow: 2px 2px 3px #999;
-	-moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#000),color-stop(0.3, #444));
-	background-image: -moz-linear-gradient(center top, #eee 0%, #444 40%, #000);
+  background-color: black;
+  font-weight: bold;
+  color: #ffffff;
+  margin-bottom: 3px;
+  margin-top: 3px;
+  padding: 0.2em;
+  border: solid thin #333;
+  border-radius: 0.5em;
+  -webkit-border-radius: .5em;
+  -moz-border-radius: .5em;
+  box-shadow: 2px 2px 3px #999;
+  -webkit-box-shadow: 2px 2px 3px #999;
+  -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#000),color-stop(0.3, #444));
+  background-image: -moz-linear-gradient(center top, #eee 0%, #444 40%, #000);
 }
 
 div.groupHeader {
-	margin-left: 16px;
-	margin-top: 12px;
-	font-weight: bold;
+  margin-left: 16px;
+  margin-top: 12px;
+  font-weight: bold;
 }
 
 div.groupText {
-	margin-left: 16px;
-	font-style: italic;
+  margin-left: 16px;
+  font-style: italic;
 }
 
 body {
-	background-color: white;
-	color: black;
+  background-color: white;
+  color: black;
         margin: 0;
 }
 
 div.contents {
-	margin-top: 10px;
-	margin-left: 8px;
-	margin-right: 8px;
+  margin-top: 10px;
+  margin-left: 12px;
+  margin-right: 8px;
 }
 
 td.indexkey {
-	background-color: #EBEFF6;
-	font-weight: bold;
-	border: 1px solid #C4CFE5;
-	margin: 2px 0px 2px 0;
-	padding: 2px 10px;
+  background-color: #EBEFF6;
+  font-weight: bold;
+  border: 1px solid #C4CFE5;
+  margin: 2px 0px 2px 0;
+  padding: 2px 10px;
+        white-space: nowrap;
+        vertical-align: top;
 }
 
 td.indexvalue {
-	background-color: #EBEFF6;
-	border: 1px solid #C4CFE5;
-	padding: 2px 10px;
-	margin: 2px 0px;
+  background-color: #EBEFF6;
+  border: 1px solid #C4CFE5;
+  padding: 2px 10px;
+  margin: 2px 0px;
 }
 
 tr.memlist {
-	background-color: #EEF1F7;
+  background-color: #EEF1F7;
 }
 
 p.formulaDsp {
-	text-align: center;
+  text-align: center;
 }
 
 img.formulaDsp {
-	
+  
 }
 
 img.formulaInl {
-	vertical-align: middle;
+  vertical-align: middle;
 }
 
 div.center {
-	text-align: center;
+  text-align: center;
         margin-top: 0px;
         margin-bottom: 0px;
         padding: 0px;
 }
 
 div.center img {
-	border: 0px;
+  border: 0px;
 }
 
 address.footer {
-	text-align: right;
-	padding-right: 12px;
+  text-align: right;
+  padding-right: 12px;
 }
 
 img.footer {
-	border: 0px;
-	vertical-align: middle;
+  border: 0px;
+  vertical-align: middle;
 }
 
 /* @group Code Colorization */
 
 span.keyword {
-	color: #008000
+  color: #008000
 }
 
 span.keywordtype {
-	color: #604020
+  color: #604020
 }
 
 span.keywordflow {
-	color: #e08000
+  color: #e08000
 }
 
 span.comment {
-	color: #800000
+  color: #800000
 }
 
 span.preprocessor {
-	color: #806020
+  color: #806020
 }
 
 span.stringliteral {
-	color: #002080
+  color: #002080
 }
 
 span.charliteral {
-	color: #008080
+  color: #008080
 }
 
 span.vhdldigit { 
-	color: #ff00ff 
+  color: #ff00ff 
 }
 
 span.vhdlchar { 
-	color: #000000 
+  color: #000000 
 }
 
 span.vhdlkeyword { 
-	color: #700070 
+  color: #700070 
 }
 
 span.vhdllogic { 
-	color: #ff0000 
+  color: #ff0000 
+}
+
+blockquote {
+        background-color: #F7F8FB;
+        border-left: 2px solid #9CAFD4;
+        margin: 0 24px 0 4px;
+        padding: 0 12px 0 16px;
 }
 
 /* @end */
 
 /*
 .search {
-	color: #003399;
-	font-weight: bold;
+  color: #003399;
+  font-weight: bold;
 }
 
 form.search {
-	margin-bottom: 0px;
-	margin-top: 0px;
+  margin-bottom: 0px;
+  margin-top: 0px;
 }
 
 input.search {
-	font-size: 75%;
-	color: #000080;
-	font-weight: normal;
-	background-color: #e8eef2;
+  font-size: 75%;
+  color: #000080;
+  font-weight: normal;
+  background-color: #e8eef2;
 }
 */
 
 td.tiny {
-	font-size: 75%;
+  font-size: 75%;
 }
 
 .dirtab {
-	padding: 4px;
-	border-collapse: collapse;
-	border: 1px solid #A3B4D7;
+  padding: 4px;
+  border-collapse: collapse;
+  border: 1px solid #A3B4D7;
 }
 
 th.dirtab {
-	background: #EBEFF6;
-	font-weight: bold;
+  background: #EBEFF6;
+  font-weight: bold;
 }
 
 hr {
-	height: 0px;
-	border: none;
-	border-top: 1px solid #4A6AAA;
+  height: 0px;
+  border: none;
+  border-top: 1px solid #4A6AAA;
 }
 
 hr.footer {
-	height: 1px;
+  height: 1px;
 }
 
 /* @group Member Descriptions */
 
 table.memberdecls {
-	border-spacing: 0px;
-	padding: 0px;
+  border-spacing: 0px;
+  padding: 0px;
+}
+
+.memberdecls td {
+  -webkit-transition-property: background-color, box-shadow;
+  -webkit-transition-duration: 0.5s;
+  -moz-transition-property: background-color, box-shadow;
+  -moz-transition-duration: 0.5s;
+  -ms-transition-property: background-color, box-shadow;
+  -ms-transition-duration: 0.5s;
+  -o-transition-property: background-color, box-shadow;
+  -o-transition-duration: 0.5s;
+  transition-property: background-color, box-shadow;
+  transition-duration: 0.5s;
+}
+
+.memberdecls td.glow {
+  background-color: cyan;
+  box-shadow: 0 0 15px cyan;
 }
 
 .mdescLeft, .mdescRight,
 .memItemLeft, .memItemRight,
 .memTemplItemLeft, .memTemplItemRight, .memTemplParams {
-	background-color: #F9FAFC;
-	border: none;
-	margin: 4px;
-	padding: 1px 0 0 8px;
+  background-color: #F9FAFC;
+  border: none;
+  margin: 4px;
+  padding: 1px 0 0 8px;
 }
 
 .mdescLeft, .mdescRight {
-	padding: 0px 8px 4px 8px;
-	color: #555;
+  padding: 0px 8px 4px 8px;
+  color: #555;
 }
 
 .memItemLeft, .memItemRight, .memTemplParams {
-	border-top: 1px solid #C4CFE5;
+  border-top: 1px solid #C4CFE5;
 }
 
 .memItemLeft, .memTemplItemLeft {
         white-space: nowrap;
 }
 
 .memItemRight {
-	width: 100%;
+  width: 100%;
 }
 
 .memTemplParams {
-	color: #4665A2;
+  color: #4665A2;
         white-space: nowrap;
 }
 
 /* @end */
 
 /* @group Member Details */
 
 /* Styles for detailed member documentation */
 
 .memtemplate {
-	font-size: 80%;
-	color: #4665A2;
-	font-weight: normal;
-	margin-left: 9px;
+  font-size: 80%;
+  color: #4665A2;
+  font-weight: normal;
+  margin-left: 9px;
 }
 
 .memnav {
-	background-color: #EBEFF6;
-	border: 1px solid #A3B4D7;
-	text-align: center;
-	margin: 2px;
-	margin-right: 15px;
-	padding: 2px;
+  background-color: #EBEFF6;
+  border: 1px solid #A3B4D7;
+  text-align: center;
+  margin: 2px;
+  margin-right: 15px;
+  padding: 2px;
 }
 
 .mempage {
-	width: 100%;
+  width: 100%;
 }
 
 .memitem {
-	padding: 0;
-	margin-bottom: 10px;
-	margin-right: 5px;
+  padding: 0;
+  margin-bottom: 10px;
+  margin-right: 5px;
+        -webkit-transition: box-shadow 0.5s linear;
+        -moz-transition: box-shadow 0.5s linear;
+        -ms-transition: box-shadow 0.5s linear;
+        -o-transition: box-shadow 0.5s linear;
+        transition: box-shadow 0.5s linear;
+}
+
+.memitem.glow {
+         box-shadow: 0 0 15px cyan;
 }
 
 .memname {
-        white-space: nowrap;
         font-weight: bold;
         margin-left: 6px;
 }
 
+.memname td {
+  vertical-align: bottom;
+}
+
 .memproto, dl.reflist dt {
         border-top: 1px solid #A8B8D9;
         border-left: 1px solid #A8B8D9;
         border-right: 1px solid #A8B8D9;
         padding: 6px 0px 6px 0px;
         color: #253555;
         font-weight: bold;
         text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
+        background-image:url('nav_f.png');
+        background-repeat:repeat-x;
+        background-color: #E2E8F2;
         /* opera specific markup */
         box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        border-top-right-radius: 8px;
-        border-top-left-radius: 8px;
+        border-top-right-radius: 4px;
+        border-top-left-radius: 4px;
         /* firefox specific markup */
         -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-        -moz-border-radius-topright: 8px;
-        -moz-border-radius-topleft: 8px;
+        -moz-border-radius-topright: 4px;
+        -moz-border-radius-topleft: 4px;
         /* webkit specific markup */
         -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        -webkit-border-top-right-radius: 8px;
-        -webkit-border-top-left-radius: 8px;
-        background-image:url('nav_f.png');
-        background-repeat:repeat-x;
-        background-color: #E2E8F2;
+        -webkit-border-top-right-radius: 4px;
+        -webkit-border-top-left-radius: 4px;
 
 }
 
 .memdoc, dl.reflist dd {
         border-bottom: 1px solid #A8B8D9;      
         border-left: 1px solid #A8B8D9;      
         border-right: 1px solid #A8B8D9; 
-        padding: 2px 5px;
+        padding: 6px 10px 2px 10px;
         background-color: #FBFCFD;
         border-top-width: 0;
+        background-image:url('nav_g.png');
+        background-repeat:repeat-x;
+        background-color: #FFFFFF;
         /* opera specific markup */
-        border-bottom-left-radius: 8px;
-        border-bottom-right-radius: 8px;
+        border-bottom-left-radius: 4px;
+        border-bottom-right-radius: 4px;
         box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
         /* firefox specific markup */
-        -moz-border-radius-bottomleft: 8px;
-        -moz-border-radius-bottomright: 8px;
+        -moz-border-radius-bottomleft: 4px;
+        -moz-border-radius-bottomright: 4px;
         -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-        background-image: -moz-linear-gradient(center top, #FFFFFF 0%, #FFFFFF 60%, #F7F8FB 95%, #EEF1F7);
         /* webkit specific markup */
-        -webkit-border-bottom-left-radius: 8px;
-        -webkit-border-bottom-right-radius: 8px;
+        -webkit-border-bottom-left-radius: 4px;
+        -webkit-border-bottom-right-radius: 4px;
         -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        background-image: -webkit-gradient(linear,center top,center bottom,from(#FFFFFF), color-stop(0.6,#FFFFFF), color-stop(0.60,#FFFFFF), color-stop(0.95,#F7F8FB), to(#EEF1F7));
 }
 
 dl.reflist dt {
         padding: 5px;
 }
 
 dl.reflist dd {
         margin: 0px 0px 10px 0px;
         padding: 5px;
 }
 
 .paramkey {
-	text-align: right;
+  text-align: right;
 }
 
 .paramtype {
-	white-space: nowrap;
+  white-space: nowrap;
 }
 
 .paramname {
-	color: #602020;
-	white-space: nowrap;
+  color: #602020;
+  white-space: nowrap;
 }
 .paramname em {
-	font-style: normal;
+  font-style: normal;
 }
 
 .params, .retval, .exception, .tparams {
-        border-spacing: 6px 2px;
+        margin-left: 0px;
+        padding-left: 0px;
 }       
 
 .params .paramname, .retval .paramname {
         font-weight: bold;
         vertical-align: top;
 }
         
 .params .paramtype {
         font-style: italic;
         vertical-align: top;
 }       
         
 .params .paramdir {
         font-family: "courier new",courier,monospace;
         vertical-align: top;
 }
 
+table.mlabels {
+  border-spacing: 0px;
+}
 
-
-
-/* @end */
-
-/* @group Directory (tree) */
-
-/* for the tree view */
-
-.ftvtree {
-	font-family: sans-serif;
-	margin: 0px;
+td.mlabels-left {
+  width: 100%;
+  padding: 0px;
 }
 
-/* these are for tree view when used as main index */
+td.mlabels-right {
+  vertical-align: bottom;
+  padding: 0px;
+  white-space: nowrap;
+}
 
-.directory {
-	font-size: 9pt;
-	font-weight: bold;
-	margin: 5px;
+span.mlabels {
+        margin-left: 8px;
 }
 
-.directory h3 {
-	margin: 0px;
-	margin-top: 1em;
-	font-size: 11pt;
+span.mlabel {
+        background-color: #728DC1;
+        border-top:1px solid #5373B4;
+        border-left:1px solid #5373B4;
+        border-right:1px solid #C4CFE5;
+        border-bottom:1px solid #C4CFE5;
+  text-shadow: none;
+        color: white;
+        margin-right: 4px;
+        padding: 2px 3px;
+        border-radius: 3px;
+        font-size: 7pt;
+  white-space: nowrap;
 }
 
-/*
-The following two styles can be used to replace the root node title
-with an image of your choice.  Simply uncomment the next two styles,
-specify the name of your image and be sure to set 'height' to the
-proper pixel height of your image.
-*/
 
-/*
-.directory h3.swap {
-	height: 61px;
-	background-repeat: no-repeat;
-	background-image: url("yourimage.gif");
-}
-.directory h3.swap span {
-	display: none;
-}
-*/
 
-.directory > h3 {
-	margin-top: 0;
-}
+/* @end */
 
-.directory p {
-	margin: 0px;
-	white-space: nowrap;
-}
+/* these are for tree view when not used as main index */
 
-.directory div {
-	display: none;
-	margin: 0px;
+div.directory {
+        margin: 10px 0px;
+        border-top: 1px solid #A8B8D9;
+        border-bottom: 1px solid #A8B8D9;
+        width: 100%;
 }
 
-.directory img {
-	vertical-align: -30%;
+.directory table {
+        border-collapse:collapse;
 }
 
-/* these are for tree view when not used as main index */
+.directory td {
+        margin: 0px;
+        padding: 0px;
+  vertical-align: top;
+}
 
-.directory-alt {
-	font-size: 100%;
-	font-weight: bold;
+.directory td.entry {
+        white-space: nowrap;
+        padding-right: 6px;
 }
 
-.directory-alt h3 {
-	margin: 0px;
-	margin-top: 1em;
-	font-size: 11pt;
+.directory td.entry a {
+        outline:none;
 }
 
-.directory-alt > h3 {
-	margin-top: 0;
+.directory td.desc {
+        width: 100%;
+        padding-left: 6px;
+  padding-right: 6px;
+  border-left: 1px solid rgba(0,0,0,0.05);
 }
 
-.directory-alt p {
-	margin: 0px;
-	white-space: nowrap;
+.directory tr.even {
+  padding-left: 6px;
+  background-color: #F7F8FB;
 }
 
-.directory-alt div {
-	display: none;
-	margin: 0px;
+.directory img {
+  vertical-align: -30%;
 }
 
-.directory-alt img {
-	vertical-align: -30%;
+.directory .levels {
+        white-space: nowrap;
+        width: 100%;
+        text-align: right;
+        font-size: 9pt;
 }
 
-/* @end */
+.directory .levels span {
+        cursor: pointer;
+        padding-left: 2px;
+        padding-right: 2px;
+  color: #3D578C;
+}
 
 div.dynheader {
         margin-top: 8px;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
 }
 
 address {
-	font-style: normal;
-	color: #2A3D61;
+  font-style: normal;
+  color: #2A3D61;
 }
 
 table.doxtable {
-	border-collapse:collapse;
+  border-collapse:collapse;
+        margin-top: 4px;
+        margin-bottom: 4px;
 }
 
 table.doxtable td, table.doxtable th {
-	border: 1px solid #2D4068;
-	padding: 3px 7px 2px;
+  border: 1px solid #2D4068;
+  padding: 3px 7px 2px;
 }
 
 table.doxtable th {
-	background-color: #374F7F;
-	color: #FFFFFF;
-	font-size: 110%;
-	padding-bottom: 4px;
-	padding-top: 5px;
-	text-align:left;
+  background-color: #374F7F;
+  color: #FFFFFF;
+  font-size: 110%;
+  padding-bottom: 4px;
+  padding-top: 5px;
 }
 
 table.fieldtable {
         width: 100%;
         margin-bottom: 10px;
         border: 1px solid #A8B8D9;
         border-spacing: 0px;
         -moz-border-radius: 4px;
         -webkit-border-radius: 4px;
         border-radius: 4px;
         -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
         -webkit-box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
         box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
 }
 
 .fieldtable td, .fieldtable th {
         padding: 3px 7px 2px;
 }
 
 .fieldtable td.fieldtype, .fieldtable td.fieldname {
         white-space: nowrap;
         border-right: 1px solid #A8B8D9;
         border-bottom: 1px solid #A8B8D9;
         vertical-align: top;
 }
 
 .fieldtable td.fielddoc {
         border-bottom: 1px solid #A8B8D9;
         width: 100%;
 }
 
 .fieldtable tr:last-child td {
         border-bottom: none;
 }
 
 .fieldtable th {
         background-image:url('nav_f.png');
         background-repeat:repeat-x;
         background-color: #E2E8F2;
         font-size: 90%;
         color: #253555;
         padding-bottom: 4px;
         padding-top: 5px;
         text-align:left;
         -moz-border-radius-topleft: 4px;
         -moz-border-radius-topright: 4px;
         -webkit-border-top-left-radius: 4px;
         -webkit-border-top-right-radius: 4px;
         border-top-left-radius: 4px;
         border-top-right-radius: 4px;
         border-bottom: 1px solid #A8B8D9;
 }
 
 
 .tabsearch {
-	top: 0px;
-	left: 10px;
-	height: 36px;
-	background-image: url('tab_b.png');
-	z-index: 101;
-	overflow: hidden;
-	font-size: 13px;
+  top: 0px;
+  left: 10px;
+  height: 36px;
+  background-image: url('tab_b.png');
+  z-index: 101;
+  overflow: hidden;
+  font-size: 13px;
 }
 
 .navpath ul
 {
-	font-size: 11px;
-	background-image:url('tab_b.png');
-	background-repeat:repeat-x;
-	height:30px;
-	line-height:30px;
-	color:#8AA0CC;
-	border:solid 1px #C2CDE4;
-	overflow:hidden;
-	margin:0px;
-	padding:0px;
+  font-size: 11px;
+  background-image:url('tab_b.png');
+  background-repeat:repeat-x;
+  height:30px;
+  line-height:30px;
+  color:#8AA0CC;
+  border:solid 1px #C2CDE4;
+  overflow:hidden;
+  margin:0px;
+  padding:0px;
 }
 
 .navpath li
 {
-	list-style-type:none;
-	float:left;
-	padding-left:10px;
-	padding-right:15px;
-	background-image:url('bc_s.png');
-	background-repeat:no-repeat;
-	background-position:right;
-	color:#364D7C;
+  list-style-type:none;
+  float:left;
+  padding-left:10px;
+  padding-right:15px;
+  background-image:url('bc_s.png');
+  background-repeat:no-repeat;
+  background-position:right;
+  color:#364D7C;
 }
 
 .navpath li.navelem a
 {
-	height:32px;
-	display:block;
-	text-decoration: none;
-	outline: none;
+  height:32px;
+  display:block;
+  text-decoration: none;
+  outline: none;
 }
 
 .navpath li.navelem a:hover
 {
-	color:#6884BD;
+  color:#6884BD;
 }
 
 .navpath li.footer
 {
         list-style-type:none;
         float:right;
         padding-left:10px;
         padding-right:15px;
         background-image:none;
         background-repeat:no-repeat;
         background-position:right;
         color:#364D7C;
         font-size: 8pt;
 }
 
 
 div.summary
 {
-	float: right;
-	font-size: 8pt;
-	padding-right: 5px;
-	width: 50%;
-	text-align: right;
+  float: right;
+  font-size: 8pt;
+  padding-right: 5px;
+  width: 50%;
+  text-align: right;
 }       
 
 div.summary a
 {
-	white-space: nowrap;
+  white-space: nowrap;
 }
 
 div.ingroups
 {
-	margin-left: 5px;
-	font-size: 8pt;
-	padding-left: 5px;
-	width: 50%;
-	text-align: left;
+  margin-left: 5px;
+  font-size: 8pt;
+  padding-left: 5px;
+  width: 50%;
+  text-align: left;
 }
 
 div.ingroups a
 {
-	white-space: nowrap;
+  white-space: nowrap;
 }
 
 div.header
 {
         background-image:url('nav_h.png');
         background-repeat:repeat-x;
-	background-color: #F9FAFC;
-	margin:  0px;
-	border-bottom: 1px solid #C4CFE5;
+  background-color: #F9FAFC;
+  margin:  0px;
+  border-bottom: 1px solid #C4CFE5;
 }
 
 div.headertitle
 {
-	padding: 5px 5px 5px 7px;
+  padding: 5px 5px 5px 7px;
 }
 
 dl
 {
         padding: 0 0 0 10px;
 }
 
-dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug
+/* dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug */
+dl.section
 {
-        border-left:4px solid;
-        padding: 0 0 0 6px;
+  margin-left: 0px;
+  padding-left: 0px;
 }
 
 dl.note
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #D0C000;
 }
 
 dl.warning, dl.attention
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #FF0000;
 }
 
 dl.pre, dl.post, dl.invariant
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #00D000;
 }
 
 dl.deprecated
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #505050;
 }
 
 dl.todo
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #00C0E0;
 }
 
 dl.test
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #3030E0;
 }
 
 dl.bug
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #C08050;
 }
 
+dl.section dd {
+  margin-bottom: 6px;
+}
+
+
 #projectlogo
 {
-	text-align: center;
-	vertical-align: bottom;
-	border-collapse: separate;
+  text-align: center;
+  vertical-align: bottom;
+  border-collapse: separate;
 }
  
 #projectlogo img
 { 
-	border: 0px none;
+  border: 0px none;
 }
  
 #projectname
 {
-	font: 300% Tahoma, Arial,sans-serif;
-	margin: 0px;
-	padding: 2px 0px;
+  font: 300% Tahoma, Arial,sans-serif;
+  margin: 0px;
+  padding: 2px 0px;
 }
     
 #projectbrief
 {
-	font: 120% Tahoma, Arial,sans-serif;
-	margin: 0px;
-	padding: 0px;
+  font: 120% Tahoma, Arial,sans-serif;
+  margin: 0px;
+  padding: 0px;
 }
 
 #projectnumber
 {
-	font: 50% Tahoma, Arial,sans-serif;
-	margin: 0px;
-	padding: 0px;
+  font: 50% Tahoma, Arial,sans-serif;
+  margin: 0px;
+  padding: 0px;
 }
 
 #titlearea
 {
-	padding: 0px;
-	margin: 0px;
-	width: 100%;
-	border-bottom: 1px solid #5373B4;
+  padding: 0px;
+  margin: 0px;
+  width: 100%;
+  border-bottom: 1px solid #5373B4;
 }
 
 .image
 {
         text-align: center;
 }
 
 .dotgraph
 {
         text-align: center;
 }
 
 .mscgraph
 {
         text-align: center;
 }
 
 .caption
 {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 div.zoom
 {
-	border: 1px solid #90A5CE;
+  border: 1px solid #90A5CE;
 }
 
 dl.citelist {
         margin-bottom:50px;
 }
 
 dl.citelist dt {
         color:#334975;
         float:left;
         font-weight:bold;
         margin-right:10px;
         padding:5px;
 }
 
 dl.citelist dd {
         margin:2px 0;
         padding:5px 0;
 }
 
+div.toc {
+        padding: 14px 25px;
+        background-color: #F4F6FA;
+        border: 1px solid #D8DFEE;
+        border-radius: 7px 7px 7px 7px;
+        float: right;
+        height: auto;
+        margin: 0 20px 10px 10px;
+        width: 200px;
+}
+
+div.toc li {
+        background: url("bdwn.png") no-repeat scroll 0 5px transparent;
+        font: 10px/1.2 Verdana,DejaVu Sans,Geneva,sans-serif;
+        margin-top: 5px;
+        padding-left: 10px;
+        padding-top: 2px;
+}
+
+div.toc h3 {
+        font: bold 12px/1.2 Arial,FreeSans,sans-serif;
+  color: #4665A2;
+        border-bottom: 0 none;
+        margin: 0;
+}
+
+div.toc ul {
+        list-style: none outside none;
+        border: medium none;
+        padding: 0px;
+}       
+
+div.toc li.level1 {
+        margin-left: 0px;
+}
+
+div.toc li.level2 {
+        margin-left: 15px;
+}
+
+div.toc li.level3 {
+        margin-left: 30px;
+}
+
+div.toc li.level4 {
+        margin-left: 45px;
+}
+
+.inherit_header {
+        font-weight: bold;
+        color: gray;
+        cursor: pointer;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+.inherit_header td {
+        padding: 6px 0px 2px 5px;
+}
+
+.inherit {
+        display: none;
+}
+
+tr.heading h2 {
+        margin-top: 12px;
+        margin-bottom: 4px;
+}
+
 @media print
 {
   #top { display: none; }
   #side-nav { display: none; }
   #nav-path { display: none; }
   body { overflow:visible; }
   h1, h2, h3, h4, h5, h6 { page-break-after: avoid; }
   .summary { display: none; }
   .memitem { page-break-inside: avoid; }
   #doc-content
   {
     margin-left:0 !important;
     height:auto !important;
     width:auto !important;
     overflow:inherit;
     display:inline;
   }
-  pre.fragment
-  {
-    overflow: visible;
-    text-wrap: unrestricted;
-    white-space: -moz-pre-wrap; /* Moz */
-    white-space: -pre-wrap; /* Opera 4-6 */
-    white-space: -o-pre-wrap; /* Opera 7 */
-    white-space: pre-wrap; /* CSS3  */
-    word-wrap: break-word; /* IE 5.5+ */
-  }
 }
 
-
 /* CSS for the generated extension point documentation, copied from schema.css */
 
 H6.SchemaHeader {
-	font-size:16px; 
-	display:inline
+  font-size:16px; 
+  display:inline
 }
 
 P.SchemaCopyright {
-	font-size: smaller; 
-	font-style: normal;
-	color: #336699; 
-	display:inline;
-	margin-top: 3.000000pt;
-	margin-bottom: 11.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;
+  font-size: smaller; 
+  font-style: normal;
+  color: #336699; 
+  display:inline;
+  margin-top: 3.000000pt;
+  margin-bottom: 11.000000pt;
+  margin-right: 0.000000pt;
+  margin-left: 0.000000pt;
 }
 
 P.SchemaDtd {
-	color: #800000; 
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 10.000000pt;
+  color: #800000; 
+  margin-top: 0.000000pt;
+  margin-bottom: 0.000000pt;
+  margin-right: 0.000000pt;
+  margin-left: 10.000000pt;
 }
 
 P.SchemaDtdAttlist {
-	color: #800000; 
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 20.000000pt;
+  color: #800000; 
+  margin-top: 0.000000pt;
+  margin-bottom: 0.000000pt;
+  margin-right: 0.000000pt;
+  margin-left: 20.000000pt;
 }
 
 span.SchemaTag {
-	color: #000080;
+  color: #000080;
 }
 
 span.SchemaCstring {
-	color: #008000;
+  color: #008000;
 }
 
 pre.Example {
-	margin-top: 0.000000pt;
+  margin-top: 0.000000pt;
 }
 
 .ConfigMarkupElementDesc {
-	color: black;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 10.000000pt;
+  color: black;
+  margin-top: 0.000000pt;
+  margin-bottom: 0.000000pt;
+  margin-right: 0.000000pt;
+  margin-left: 10.000000pt;
 }
 
 .ConfigMarkupAttlistDesc {
-	color: black;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 32.000000pt;
+  color: black;
+  margin-top: 0.000000pt;
+  margin-bottom: 0.000000pt;
+  margin-right: 0.000000pt;
+  margin-left: 32.000000pt;
 }
 
-
diff --git a/Modules/ImageExtraction/Testing/mitkExtractDirectedPlaneImageFilterTest.cpp b/Modules/ImageExtraction/Testing/mitkExtractDirectedPlaneImageFilterTest.cpp
index 9312793c19..0e77e3f920 100644
--- a/Modules/ImageExtraction/Testing/mitkExtractDirectedPlaneImageFilterTest.cpp
+++ b/Modules/ImageExtraction/Testing/mitkExtractDirectedPlaneImageFilterTest.cpp
@@ -1,297 +1,296 @@
-/*=========================================================================
+/*===================================================================
 
-Program:   Medical Imaging & Interaction Toolkit
-Language:  C++
-Date:      $Date$
-Version:   $Revision: 7837 $
+The Medical Imaging Interaction Toolkit (MITK)
 
-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.
+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 the above copyright notices for more information.
+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 "mitkExtractDirectedPlaneImageFilter.h"
 //#include "mitkStandardFileLocations.h"
 //
 //#include <vtkImageData.h>
 //#include <vtkSmartPointer.h>
 //#include <mitkItkImageFileReader.h>
 //#include <vtkActor.h>
 //#include <vtkRenderWindowInteractor.h>
 //
 //#include "mitkTestingMacros.h"
 //
 //#include <iostream>
 //
 //
 //class ExtractionTesting{
 //
 //public:
 //
 //  struct Testcase
 //  {
 //    int number;
 //    std::string name;
 //    std::string imageFilename;
 //    std::string referenceImageFilename;
 //    bool success;
 //    mitk::Geometry2D::Pointer (*GetPlane) (void);
 //  };
 //
 //  static void DoTesting(Testcase &testcase)
 //  {
 //    mitk::Image::Pointer image = GetImageToTest(testcase.imageFilename);
 //    if ( image.IsNull){
 //      testcase.success = false;
 //      return;
 //    }
 //
 //    /*mitk::Image::Pointer referenceImage = GetImageToTest(testcase.referenceImageFilename);
 //    if ( referenceImage.IsNull){
 //      testcase.success = false;
 //      return;
 //    }
 //
 //    mitk::Geometry2D::Pointer directedGeometry2D = testcase.GetPlane();
 //    if(directedGeometry2D.IsNull){
 //      testcase.success = false;*/
 //    }
 //
 //    //put testing here
 //    //TODO vtkIMageREslice setup
 //    //vtkSmartPointer<vtk
 //
 //      vtkSmartPointer<vtkImageData> colorImage = image->GetVtkImageData();
 //
 //    vtkSmartPointer<vtkImageMapper3D> imageMapper = vtkSmartPointer<vtkImageMapper3D>::New();
 //    imageMapper->SetInput(colorImage);
 //    
 //
 //    vtkSmartPointer<vtkActor> imageActor = vtkSmartPointer<vtkActor>::New();
 //    imageActor->SetMapper(imageMapper);
 //    //imageActor->SetPosition(20, 20);
 //
 //    // Setup renderers
 //    vtkSmartPointer<vtkRenderer> renderer = vtkSmartPointer<vtkRenderer>::New();
 //
 //    // Setup render window
 //    vtkSmartPointer<vtkRenderWindow> renderWindow = vtkSmartPointer<vtkRenderWindow>::New();
 //    renderWindow->AddRenderer(renderer);
 //
 //    // Setup render window interactor
 //    vtkSmartPointer<vtkRenderWindowInteractor> renderWindowInteractor = vtkSmartPointer<vtkRenderWindowInteractor>::New();
 //    vtkSmartPointer<vtkInteractorStyleImage> style = vtkSmartPointer<vtkInteractorStyleImage>::New();
 //    renderWindowInteractor->SetInteractorStyle(style);
 //
 //    // Render and start interaction
 //    renderWindowInteractor->SetRenderWindow(renderWindow);
 //    //renderer->AddViewProp(imageActor);
 //    renderer->AddActor(imageActor);
 //
 //    renderWindow->Render();
 //    renderWindowInteractor->Start();
 //  }
 //
 //
 //  static std::vector<testCase> InitializeTestCases()
 //  {
 //    int testcounter = 0;
 //    std::vector<testCase> tests=
 //
 //    //#BEGIN setup TestCases
 //
 //    {
 //      {
 //        ++testcounter,
 //        "TestCoronal",
 //        "image.nrrd",
 //        "coronalReference.nrrd",
 //        false,
 //        &TestCoronal
 //      },
 //      {
 //        ++testcounter,
 //        "TestSagital",
 //        "image.nrrd",
 //        "sagitalReference.nrrd",
 //        false,
 //        &TestSagital
 //      },
 //      {
 //        ++testcounter,
 //        "TestCoronal",
 //        "image.nrrd",
 //        "coronalReference.nrrd",
 //        false,
 //        &TestCoronal
 //      },
 //      {
 //        ++testcounter,
 //        "Test_u_Rotation",
 //        "image.nrrd",
 //        "uRotationReference.nrrd",
 //        false,
 //        &Test_u_Rotation
 //      },
 //      {
 //        ++testcounter,
 //        "Test_v_Rotation",
 //        "image.nrrd",
 //        "vRotationReference.nrrd",
 //        false,
 //        &Test_v_Rotation
 //      },
 //      {
 //        ++testcounter,
 //        "TestTwoDirectionalRation",
 //        "image.nrrd",
 //        "twoDirectionalRationReference.nrrd",
 //        false,
 //        &TestTwoDirectionalRotation
 //      },
 //      {
 //        ++testcounter,
 //        "Test4D",
 //        "image.nrrd",
 //        "twoDirectionalRationReference.nrrd",
 //        false,
 //        &Test4D
 //      },
 //      {
 //        ++testcounter,
 //        "Test2D",
 //        "coronalReference.nrrd",
 //        "coronalReference.nrrd",
 //        false,
 //        &Test2D
 //      },
 //      {
 //        ++testcounter,
 //        "Test2D",
 //        NULL,
 //        NULL,
 //        false,
 //        &Test1D
 //      }
 //
 //    };
 //
 //    //#END setup TestCases
 //
 //    return tests;
 //  }
 //
 //protected:
 //
 //  static mitk::Image::Pointer GetImageToTest(std::string filename){
 //    //retrieve referenceImage
 //
 ////  mitk::StandardFileLocations::Pointer locator = mitk::StandardFileLocations::GetInstance();
 ////
 ////  const std::string filepath = locator->FindFile(filename, "Modules/MitkExt/Testing/Data");
 ////
 ////  if (filepath.empty())
 ////  {
 ////  return NULL;
 ////  }
 ////
 //////TODO read imge from file
 ////  itk::FilenamesContainer file;
 ////  file.push_back( filename );
 //    mitk::ItkImageFileReader::Pointer reader = mitk::ItkImageFileReader::New();
 //    reader->SetFileName("C:\home\Pics\Pic3D.nrrd");
 //
 //    reader->Update();
 //
 //    mitk::Image::Pointer image = reader->GetOutput();
 //
 //    return image;
 //  }
 //
 //
 //  static mitk::Geometry2D::Pointer TestSagital()
 //  {
 //    
 //    return NULL;
 //  }
 //
 //  static mitk::Geometry2D::Pointer TestCoronal()
 //  {
 //return NULL;
 //  }
 //
 //  static mitk::Geometry2D::Pointer TestTransversal()
 //  {
 //return NULL;
 //  }
 //
 //  static mitk::Geometry2D::Pointer Test_u_Rotation()
 //  {
 //return NULL;
 //  }
 //
 //  static mitk::Geometry2D::Pointer Test_v_Rotation()
 //  {
 //return NULL;
 //  }
 //
 //  static mitk::Geometry2D::Pointer TestTwoDirectionalRotation()
 //  {
 //return NULL;
 //  }
 //
 //  static mitk::Geometry2D::Pointer Test4DImage()
 //  {return NULL;
 //
 //  }
 //
 //  static mitk::Geometry2D::Pointer Test2DImage()
 //  {
 //return NULL;
 //  }
 //
 //  static mitk::Geometry2D::Pointer Test1DImage()
 //  {
 //return NULL;
 //  }
 //
 //};
 //
 //
 //**
 // *  Tests for the class "mitkExtractDirectedPlaneImageFilter".
 // *  
 // *  argc and argv are the command line parameters which were passed to 
 // *  the ADD_TEST command in the CMakeLists.txt file. For the automatic
 // *  tests, argv is either empty for the simple tests or contains the filename
 // *  of a test image for the image tests (see CMakeLists.txt).
 // */
 //int mitkExtractDirectedPlaneImageFilterTest(int /* argc */, char* /*argv*/[])
 //{
 //  // always start with this!
 //  MITK_TEST_BEGIN("mitkExtractDirectedPlaneImageFilter")
 //
 //
 //    mitk::ExtractDirectedPlaneImageFilter::Pointer extractor = mitk::ExtractDirectedPlaneImageFilter::New();
 //  MITK_TEST_CONDITION_REQUIRED(extractor.IsNotNull(),"Testing instantiation") 
 //
 //
 //    std::vector<ExtractionTesting::Testcase> allTests = ExtractionTesting::InitializeTestCases();
 //
 //  for( int i = 0; i < allTests.size(); i++);{
 //
 //    ExtractionTesting::Testcase testCase = allTest[i];
 //
 //    ExtractionTesting::DoTesting(testCase);
 //
 //    MITK_TEST_CONDITION(testCase.success, "Testcase #'" << testCase.number << " " << testCase.name); 
 //  }
 //
 //  // always end with this!
 //  MITK_TEST_END()
 //}
diff --git a/Modules/Segmentation/Interactions/mitkContourTool.cpp b/Modules/Segmentation/Interactions/mitkContourTool.cpp
index b917fffe4c..d1883b96c9 100644
--- a/Modules/Segmentation/Interactions/mitkContourTool.cpp
+++ b/Modules/Segmentation/Interactions/mitkContourTool.cpp
@@ -1,159 +1,157 @@
 /*===================================================================
 
 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 "mitkContourTool.h"
 
 #include "mitkToolManager.h"
 #include "mitkOverwriteSliceImageFilter.h"
 #include "mitkOverwriteDirectedPlaneImageFilter.h"
 
 #include "mitkBaseRenderer.h"
 #include "mitkRenderingManager.h"
 //#include "mitkProperties.h"
 #include "mitkPlanarCircle.h"
 
 
 mitk::ContourTool::ContourTool(int paintingPixelValue)
 :FeedbackContourTool("PressMoveReleaseWithCTRLInversion"),
  m_PaintingPixelValue(paintingPixelValue)
 {
 }
 
 mitk::ContourTool::~ContourTool()
 {
 }
 
 void mitk::ContourTool::Activated()
 {
   Superclass::Activated();
 }
 
 void mitk::ContourTool::Deactivated()
 {
   Superclass::Deactivated();
 }
 
 /**
  Just show the contour, insert the first point.
 */
 bool mitk::ContourTool::OnMousePressed (Action* action, const StateEvent* stateEvent)
 {
   if (!FeedbackContourTool::OnMousePressed( action, stateEvent )) return false;
 
   const PositionEvent* positionEvent = dynamic_cast<const PositionEvent*>(stateEvent->GetEvent());
   if (!positionEvent) return false;
 
   Contour* contour = FeedbackContourTool::GetFeedbackContour();
   contour->Initialize();
   contour->AddVertex( positionEvent->GetWorldPosition() );
   
   FeedbackContourTool::SetFeedbackContourVisible(true);
   assert( positionEvent->GetSender()->GetRenderWindow() );
   mitk::RenderingManager::GetInstance()->RequestUpdate( positionEvent->GetSender()->GetRenderWindow() );
 
   return true;
 }
 
 /**
  Insert the point to the feedback contour.
 */
 bool mitk::ContourTool::OnMouseMoved   (Action* action, const StateEvent* stateEvent)
 {
   if (!FeedbackContourTool::OnMouseMoved( action, stateEvent )) return false;
 
   const PositionEvent* positionEvent = dynamic_cast<const PositionEvent*>(stateEvent->GetEvent());
   if (!positionEvent) return false;
 
   Contour* contour = FeedbackContourTool::GetFeedbackContour();
   contour->AddVertex( positionEvent->GetWorldPosition() );
 
   assert( positionEvent->GetSender()->GetRenderWindow() );
   mitk::RenderingManager::GetInstance()->RequestUpdate( positionEvent->GetSender()->GetRenderWindow() );
   
   return true;
 }
 
 /**
   Close the contour, project it to the image slice and fill it in 2D.
 */
 bool mitk::ContourTool::OnMouseReleased(Action* action, const StateEvent* stateEvent)
 {
   // 1. Hide the feedback contour, find out which slice the user clicked, find out which slice of the toolmanager's working image corresponds to that
   FeedbackContourTool::SetFeedbackContourVisible(false);
   
   const PositionEvent* positionEvent = dynamic_cast<const PositionEvent*>(stateEvent->GetEvent());
   if (!positionEvent) return false;
 
   assert( positionEvent->GetSender()->GetRenderWindow() );
   mitk::RenderingManager::GetInstance()->RequestUpdate( positionEvent->GetSender()->GetRenderWindow() );
   
   if (!FeedbackContourTool::OnMouseReleased( action, stateEvent )) return false;
 
   DataNode* workingNode( m_ToolManager->GetWorkingData(0) );
   if (!workingNode) return false;
 
   Image* image = dynamic_cast<Image*>(workingNode->GetData());
   const PlaneGeometry* planeGeometry( dynamic_cast<const PlaneGeometry*> (positionEvent->GetSender()->GetCurrentWorldGeometry2D() ) );
   if ( !image || !planeGeometry ) return false;
   
     // 2. Slice is known, now we try to get it as a 2D image and project the contour into index coordinates of this slice
     Image::Pointer slice = SegTool2D::GetAffectedImageSliceAs2DImage( positionEvent, image );
 
     if ( slice.IsNull() )
     {
       MITK_ERROR << "Unable to extract slice." << std::endl;
       return false;
     }    
    
     Contour* feedbackContour( FeedbackContourTool::GetFeedbackContour() );
     Contour::Pointer projectedContour = FeedbackContourTool::ProjectContourTo2DSlice( slice, feedbackContour, true, false ); // true: actually no idea why this is neccessary, but it works :-(
 
     if (projectedContour.IsNull()) return false;
 
     FeedbackContourTool::FillContourInSlice( projectedContour, slice, m_PaintingPixelValue );
 
     this->WriteBackSegmentationResult(positionEvent, slice);
 
     // 4. Make sure the result is drawn again --> is visible then. 
     assert( positionEvent->GetSender()->GetRenderWindow() );
 
-    mitk::RenderingManager::GetInstance()->RequestUpdateAll();
-
   return true;
 }
 
 /**
   Called when the CTRL key is pressed. Will change the painting pixel value from 0 to 1 or from 1 to 0. 
 */
 bool mitk::ContourTool::OnInvertLogic(Action* action, const StateEvent* stateEvent)
 {
   if (!FeedbackContourTool::OnInvertLogic(action, stateEvent)) return false;
 
   // Inversion only for 0 and 1 as painting values
   if (m_PaintingPixelValue == 1)
   {
     m_PaintingPixelValue = 0;
     FeedbackContourTool::SetFeedbackContourColor( 1.0, 0.0, 0.0 );
   }
   else if (m_PaintingPixelValue == 0)
   {
     m_PaintingPixelValue = 1;
     FeedbackContourTool::SetFeedbackContourColorDefault();
   }
 
   return true;
 }
 
diff --git a/Modules/Segmentation/Interactions/mitkCorrectorTool2D.cpp b/Modules/Segmentation/Interactions/mitkCorrectorTool2D.cpp
index 81e213ea52..ba8882ed1c 100644
--- a/Modules/Segmentation/Interactions/mitkCorrectorTool2D.cpp
+++ b/Modules/Segmentation/Interactions/mitkCorrectorTool2D.cpp
@@ -1,150 +1,145 @@
 /*===================================================================
 
 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 "mitkCorrectorTool2D.h"
 #include "mitkCorrectorAlgorithm.h"
 
 #include "mitkToolManager.h"
 #include "mitkOverwriteSliceImageFilter.h"
 #include "mitkBaseRenderer.h"
 #include "mitkRenderingManager.h"
 
 #include "mitkCorrectorTool2D.xpm"
 
 #include "mitkOverwriteDirectedPlaneImageFilter.h"
 
 namespace mitk {
   MITK_TOOL_MACRO(Segmentation_EXPORT, CorrectorTool2D, "Correction tool");
 }
 
 mitk::CorrectorTool2D::CorrectorTool2D(int paintingPixelValue)
 :FeedbackContourTool("PressMoveRelease"),
  m_PaintingPixelValue(paintingPixelValue)
 {
   GetFeedbackContour()->SetClosed( false ); // don't close the contour to a polygon
 }
 
 mitk::CorrectorTool2D::~CorrectorTool2D()
 {
 }
 
 const char** mitk::CorrectorTool2D::GetXPM() const
 {
   return mitkCorrectorTool2D_xpm;
 }
 
 const char* mitk::CorrectorTool2D::GetName() const
 {
   return "Correction";
 }
 
 void mitk::CorrectorTool2D::Activated()
 {
   Superclass::Activated();
 }
 
 void mitk::CorrectorTool2D::Deactivated()
 {
   Superclass::Deactivated();
 }
 
 bool mitk::CorrectorTool2D::OnMousePressed (Action* action, const StateEvent* stateEvent)
 {
   if (!FeedbackContourTool::OnMousePressed( action, stateEvent )) return false;
 
   const PositionEvent* positionEvent = dynamic_cast<const PositionEvent*>(stateEvent->GetEvent());
   if (!positionEvent) return false;
 
   Contour* contour = FeedbackContourTool::GetFeedbackContour();
   contour->Initialize();
   contour->AddVertex( positionEvent->GetWorldPosition() );
   
   FeedbackContourTool::SetFeedbackContourVisible(true);
 
   return true;
 }
 
 bool mitk::CorrectorTool2D::OnMouseMoved   (Action* action, const StateEvent* stateEvent)
 {
   if (!FeedbackContourTool::OnMouseMoved( action, stateEvent )) return false;
 
   const PositionEvent* positionEvent = dynamic_cast<const PositionEvent*>(stateEvent->GetEvent());
   if (!positionEvent) return false;
 
   Contour* contour = FeedbackContourTool::GetFeedbackContour();
   contour->AddVertex( positionEvent->GetWorldPosition() );
 
   assert( positionEvent->GetSender()->GetRenderWindow() );
   mitk::RenderingManager::GetInstance()->RequestUpdate( positionEvent->GetSender()->GetRenderWindow() );
 
   return true;
 }
 
 bool mitk::CorrectorTool2D::OnMouseReleased(Action* action, const StateEvent* stateEvent)
 {
   // 1. Hide the feedback contour, find out which slice the user clicked, find out which slice of the toolmanager's working image corresponds to that
   FeedbackContourTool::SetFeedbackContourVisible(false);
   
   const PositionEvent* positionEvent = dynamic_cast<const PositionEvent*>(stateEvent->GetEvent());
   if (!positionEvent) return false;
 
   assert( positionEvent->GetSender()->GetRenderWindow() );
   mitk::RenderingManager::GetInstance()->RequestUpdate( positionEvent->GetSender()->GetRenderWindow() );
   
   if (!FeedbackContourTool::OnMouseReleased( action, stateEvent )) return false;
 
   DataNode* workingNode( m_ToolManager->GetWorkingData(0) );
   if (!workingNode) return false;
 
   Image* image = dynamic_cast<Image*>(workingNode->GetData());
   const PlaneGeometry* planeGeometry( dynamic_cast<const PlaneGeometry*> (positionEvent->GetSender()->GetCurrentWorldGeometry2D() ) );
   if ( !image || !planeGeometry ) return false;
 
   // 2. Slice is known, now we try to get it as a 2D image and project the contour into index coordinates of this slice
   m_WorkingSlice = FeedbackContourTool::GetAffectedImageSliceAs2DImage( positionEvent, image );
 
   if ( m_WorkingSlice.IsNull() )
   {
       MITK_ERROR << "Unable to extract slice." << std::endl;
       return false;
   }
 
   CorrectorAlgorithm::Pointer algorithm = CorrectorAlgorithm::New();
   algorithm->SetInput( m_WorkingSlice );
   algorithm->SetContour( FeedbackContourTool::GetFeedbackContour() );
   try 
   {
       algorithm->UpdateLargestPossibleRegion();
   }
   catch ( std::exception& e )
   {
       MITK_ERROR << "Caught exception '" << e.what() << "'" << std::endl;
   }
 
   mitk::Image::Pointer resultSlice = mitk::Image::New();
   resultSlice->Initialize(algorithm->GetOutput());
   resultSlice->SetVolume(algorithm->GetOutput()->GetData());
 
   this->WriteBackSegmentationResult(positionEvent, resultSlice);
 
-  // 6. Make sure the result is drawn again --> is visible then. 
-  assert( positionEvent->GetSender()->GetRenderWindow() );
-  mitk::RenderingManager::GetInstance()->RequestUpdate( positionEvent->GetSender()->GetRenderWindow() );
-
-
   return true;
 }
     
diff --git a/Modules/Segmentation/Interactions/mitkPaintbrushTool.cpp b/Modules/Segmentation/Interactions/mitkPaintbrushTool.cpp
index 3386da4eda..3e59afea4e 100644
--- a/Modules/Segmentation/Interactions/mitkPaintbrushTool.cpp
+++ b/Modules/Segmentation/Interactions/mitkPaintbrushTool.cpp
@@ -1,376 +1,376 @@
 /*===================================================================
 
 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 "mitkPaintbrushTool.h"
 
 #include "mitkToolManager.h"
 #include "mitkOverwriteSliceImageFilter.h"
 #include "mitkBaseRenderer.h"
 #include "mitkImageDataItem.h"
 #include "ipSegmentation.h"
 
 #include "mitkLevelWindowProperty.h"
 
 #define ROUND(a)     ((a)>0 ? (int)((a)+0.5) : -(int)(0.5-(a)))
 
 int mitk::PaintbrushTool::m_Size = 1;
 
 mitk::PaintbrushTool::PaintbrushTool(int paintingPixelValue)
 :FeedbackContourTool("PressMoveReleaseWithCTRLInversionAllMouseMoves"),
  m_PaintingPixelValue(paintingPixelValue),
  m_LastContourSize(0) // other than initial mitk::PaintbrushTool::m_Size (around l. 28)
 {
   m_MasterContour = Contour::New();
   m_MasterContour->Initialize();
   m_CurrentPlane = NULL;
 
   m_WorkingNode = DataNode::New();
   m_WorkingNode->SetProperty( "levelwindow", mitk::LevelWindowProperty::New( mitk::LevelWindow(0, 1) ) );
   m_WorkingNode->SetProperty( "binary", mitk::BoolProperty::New(true) );
 }
 
 mitk::PaintbrushTool::~PaintbrushTool()
 {
 }
 
 void mitk::PaintbrushTool::Activated()
 {
   Superclass::Activated();
   FeedbackContourTool::SetFeedbackContourVisible(true);
   SizeChanged.Send(m_Size);
 }
 
 void mitk::PaintbrushTool::Deactivated()
 {
   FeedbackContourTool::SetFeedbackContourVisible(false);
   if (m_ToolManager->GetDataStorage()->Exists(m_WorkingNode))
       m_ToolManager->GetDataStorage()->Remove(m_WorkingNode);
   Superclass::Deactivated();
+  m_WorkingSlice = NULL;
+  m_CurrentPlane = NULL;
 }
 
 void mitk::PaintbrushTool::SetSize(int value)
 {
   m_Size = value;
 }
 
 void mitk::PaintbrushTool::UpdateContour(const StateEvent* stateEvent)
 {
     //MITK_INFO<<"Update...";
   // examine stateEvent and create a contour that matches the pixel mask that we are going to draw
   const PositionEvent* positionEvent = dynamic_cast<const PositionEvent*>(stateEvent->GetEvent());
   if (!positionEvent) return;
   
   // create a copy of this slice (at least match the pixel sizes/spacings),
   // then draw the desired mask on it and create a contour from it
 
   // Convert to ipMITKSegmentationTYPE (because getting pixels relys on that data type)
   itk::Image< ipMITKSegmentationTYPE, 2 >::Pointer correctPixelTypeImage;
   CastToItkImage(m_WorkingSlice/*dynamic_cast<mitk::Image*>(m_WorkingNode->GetData())*/, correctPixelTypeImage );
   assert (correctPixelTypeImage.IsNotNull() );
 
   itk::Image< ipMITKSegmentationTYPE, 2 >::DirectionType imageDirection;
   imageDirection.SetIdentity();
   correctPixelTypeImage->SetDirection(imageDirection);
 
   Image::Pointer temporarySlice = Image::New();
   CastToMitkImage( correctPixelTypeImage, temporarySlice );
 
   //mitkIpPicDescriptor* stupidClone = mitkIpPicClone( temporarySlice->GetSliceData()->GetPicDescriptor() );
   mitkIpPicDescriptor* stupidClone = mitkIpPicNew();
   CastToIpPicDescriptor( temporarySlice->GetSliceData(), stupidClone );
   unsigned int pixelWidth  = m_Size + 1;
   unsigned int pixelHeight = m_Size + 1;
 
   if ( stupidClone->n[0] <= pixelWidth || stupidClone->n[1] <= pixelHeight )
   {
     MITK_INFO << "Brush size is bigger than your working image. Reconsider this...\n"
                 "(Or tell your progammer until (s)he fixes this message.)" << std::endl;
     mitkIpPicFree( stupidClone );
     return;
   }
   
   unsigned int lineLength( stupidClone->n[0] );
   unsigned int oneContourOffset(0);
   float circleCenterX = (float)m_Size / 2.0;
   float circleCenterY = (float)m_Size / 2.0;
   for (unsigned int x = 0; x <= pixelWidth; ++x)
   {
     for (unsigned int y = 0; y <= pixelHeight; ++y)
     {
       unsigned int offset = lineLength * y + x;
       ipMITKSegmentationTYPE* current = (ipMITKSegmentationTYPE*)stupidClone->data + offset;
 
       float pixelCenterX = x + 0.5;
       float pixelCenterY = y + 0.5;
 
       float xoff = pixelCenterX - circleCenterX;
       float yoff = pixelCenterY - circleCenterY;
 
       bool inside = xoff * xoff + yoff * yoff < (m_Size * m_Size) / 4.0; // no idea, if this would work for ellipses
       if (inside)
       {
         *current = 1;
         oneContourOffset = offset;
       }
       else
       {
         *current = 0;
       }
     }
   }
       
   int numberOfContourPoints( 0 );
   int newBufferSize( 0 );
   float* contourPoints = ipMITKSegmentationGetContour8N( stupidClone, oneContourOffset, numberOfContourPoints, newBufferSize ); // memory allocated with malloc
   if (!contourPoints) 
   {
     mitkIpPicFree( stupidClone );
     return;
   }
 
   // copy point from float* to mitk::Contour 
   Contour::Pointer contourInImageIndexCoordinates = Contour::New();
   contourInImageIndexCoordinates->Initialize();
   Point3D newPoint;
   //ipMITKSegmentationGetContour8N returns all points, which causes vtk warnings, since the first and the last points are coincident.
   //leaving the last point out, the contour is still drawn correctly
   for (int index = 0; index < numberOfContourPoints-1; ++index)
   {
     newPoint[0] = contourPoints[ 2 * index + 0 ] - circleCenterX; // master contour should be centered around (0,0)
     newPoint[1] = contourPoints[ 2 * index + 1] - circleCenterY;
     newPoint[2] = 0.0;
     MITK_DEBUG << "Point [" << index << "] (" << newPoint[0] << ", " << newPoint[1] << ")" << std::endl;
 
     contourInImageIndexCoordinates->AddVertex( newPoint );
   }
 
   free(contourPoints);
 
   m_MasterContour = contourInImageIndexCoordinates;
 
   // The PicDescriptor is only REFERENCING(!) the data, the temporarySlice takes care of deleting the data also the descriptor is pointing on
   // because they got allocated by the ImageDataItem, not the descriptor.
   stupidClone->data = NULL;
   mitkIpPicFree( stupidClone );
 }
 
 
 /**
   Just show the contour, get one point as the central point and add surrounding points to the contour.
   */
 bool mitk::PaintbrushTool::OnMousePressed (Action* action, const StateEvent* stateEvent)
 {
   return this->OnMouseMoved(action, stateEvent);
 }
 
 
 /**
   Insert the point to the feedback contour,finish to build the contour and at the same time the painting function
   */
 bool mitk::PaintbrushTool::OnMouseMoved   (Action* itkNotUsed(action), const StateEvent* stateEvent)
 {
     const PositionEvent* positionEvent = dynamic_cast<const PositionEvent*>(stateEvent->GetEvent());
     if (!positionEvent) return false;
 
     CheckIfCurrentSliceHasChanged(positionEvent);
 
     if ( m_LastContourSize != m_Size )
     {
       UpdateContour( stateEvent );
       m_LastContourSize = m_Size;
     }
 
   bool leftMouseButtonPressed(
           stateEvent->GetId() == 530
        || stateEvent->GetId() == 534
        || stateEvent->GetId() == 1
        || stateEvent->GetId() == 5
                              );
     
   Point3D worldCoordinates = positionEvent->GetWorldPosition();
   Point3D indexCoordinates;
 
   m_WorkingSlice->GetGeometry()->WorldToIndex( worldCoordinates, indexCoordinates );
 
   MITK_DEBUG << "Mouse at W " << worldCoordinates << std::endl;
   MITK_DEBUG << "Mouse at I " << indexCoordinates << std::endl;
 
   // round to nearest voxel center (abort if this hasn't changed)
   if ( m_Size % 2 == 0 ) // even
   {
     indexCoordinates[0] = ROUND( indexCoordinates[0] /*+ 0.5*/) + 0.5;
     indexCoordinates[1] = ROUND( indexCoordinates[1] /*+ 0.5*/ ) + 0.5;
   }
   else // odd
   {
     indexCoordinates[0] = ROUND( indexCoordinates[0]  ) ;
     indexCoordinates[1] = ROUND( indexCoordinates[1] ) ;
   }
 
   static Point3D lastPos; // uninitialized: if somebody finds out how this can be initialized in a one-liner, tell me
-  static bool lastLeftMouseButtonPressed(false);
   if ( fabs(indexCoordinates[0] - lastPos[0]) > mitk::eps ||
        fabs(indexCoordinates[1] - lastPos[1]) > mitk::eps ||
        fabs(indexCoordinates[2] - lastPos[2]) > mitk::eps ||
-       leftMouseButtonPressed != lastLeftMouseButtonPressed
+       leftMouseButtonPressed
      )
   {
     lastPos = indexCoordinates;
-    lastLeftMouseButtonPressed = leftMouseButtonPressed;
   }
   else
   {
     MITK_DEBUG << "." << std::flush;
     return false;
   }
     
   MITK_DEBUG << "Mouse at C " << indexCoordinates;
 
   Contour::Pointer contour = Contour::New();
   contour->Initialize();
+
   for (unsigned int index = 0; index < m_MasterContour->GetNumberOfPoints(); ++index)
   {
     Point3D point = m_MasterContour->GetPoints()->ElementAt(index);
     point[0] += indexCoordinates[ 0 ];
     point[1] += indexCoordinates[ 1 ];
 
-    MITK_DEBUG << "Contour point [" << index << "] :" << point;
     contour->AddVertex( point );
   }
   
 
   if (leftMouseButtonPressed)
   {
     FeedbackContourTool::FillContourInSlice( contour, m_WorkingSlice, m_PaintingPixelValue );
     m_WorkingNode->SetData(m_WorkingSlice);
     m_WorkingNode->Modified();
   }
 
   // visualize contour
   Contour::Pointer displayContour = Contour::New();
   displayContour->Initialize();
 
   //for (unsigned int index = 0; index < contour->GetNumberOfPoints(); ++index)
   //{
   //  Point3D point = contour->GetPoints()->ElementAt(index);
   //  if ( m_Size % 2 == 0 ) // even
   //  {
   //    point[0] += 0.5;
   //    point[1] += 0.5;
   //  }
   //  displayContour->AddVertex( point );
   //}
 
   displayContour = FeedbackContourTool::BackProjectContourFrom2DSlice( m_WorkingSlice->GetGeometry(), /*displayContour*/contour );
   SetFeedbackContour( *displayContour );
   assert( positionEvent->GetSender()->GetRenderWindow() );
 
   RenderingManager::GetInstance()->RequestUpdate( positionEvent->GetSender()->GetRenderWindow() );
 
   return true;
 }
 
 
 bool mitk::PaintbrushTool::OnMouseReleased(Action* /*action*/, const StateEvent* stateEvent)
 {
     //When mouse is released write segmentationresult back into image
     const PositionEvent* positionEvent = dynamic_cast<const PositionEvent*>(stateEvent->GetEvent());
     if (!positionEvent) return false;
     this->WriteBackSegmentationResult(positionEvent, m_WorkingSlice);
 //  FeedbackContourTool::SetFeedbackContourVisible(false);
 
   return true;
 }
 
 /**
   Called when the CTRL key is pressed. Will change the painting pixel value from 0 to 1 or from 1 to 0. 
   */
 bool mitk::PaintbrushTool::OnInvertLogic(Action* action, const StateEvent* stateEvent)
 {
   if (!FeedbackContourTool::OnInvertLogic(action, stateEvent)) return false;
 
   // Inversion only for 0 and 1 as painting values
   if (m_PaintingPixelValue == 1)
   {
     m_PaintingPixelValue = 0;
     FeedbackContourTool::SetFeedbackContourColor( 1.0, 0.0, 0.0 );
   }
   else if (m_PaintingPixelValue == 0)
   {
     m_PaintingPixelValue = 1;
     FeedbackContourTool::SetFeedbackContourColorDefault();
   }
 
   return true;
 }
 
 void mitk::PaintbrushTool::CheckIfCurrentSliceHasChanged(const PositionEvent *event)
 {
     const PlaneGeometry* planeGeometry( dynamic_cast<const PlaneGeometry*> (event->GetSender()->GetCurrentWorldGeometry2D() ) );
     DataNode* workingNode( m_ToolManager->GetWorkingData(0) );
 
     if (!workingNode)
         return;
 
     Image::Pointer image = dynamic_cast<Image*>(workingNode->GetData());
 
     if ( !image || !planeGeometry )
         return;
 
     if(m_CurrentPlane.IsNull())
     {
         m_CurrentPlane = const_cast<PlaneGeometry*>(planeGeometry);
         m_WorkingSlice = SegTool2D::GetAffectedImageSliceAs2DImage(event, image)->Clone();
 
         m_WorkingNode->ReplaceProperty( "color", workingNode->GetProperty("color") );
         m_WorkingNode->SetData(m_WorkingSlice);
     }
     else
     {
         bool isSameSlice (false);
         isSameSlice = mitk::MatrixEqualElementWise(planeGeometry->GetIndexToWorldTransform()->GetMatrix(),m_CurrentPlane->GetIndexToWorldTransform()->GetMatrix());
         isSameSlice = mitk::Equal(planeGeometry->GetIndexToWorldTransform()->GetOffset(),m_CurrentPlane->GetIndexToWorldTransform()->GetOffset());
         if (!isSameSlice)
         {
             m_ToolManager->GetDataStorage()->Remove(m_WorkingNode);
             m_CurrentPlane = NULL;
             m_WorkingSlice = NULL;
             m_WorkingNode = NULL;
             m_CurrentPlane = const_cast<PlaneGeometry*>(planeGeometry);
             m_WorkingSlice = SegTool2D::GetAffectedImageSliceAs2DImage(event, image)->Clone();
 
             m_WorkingNode = mitk::DataNode::New();
             m_WorkingNode->SetProperty( "levelwindow", mitk::LevelWindowProperty::New( mitk::LevelWindow(0, 1) ) );
             m_WorkingNode->SetProperty( "binary", mitk::BoolProperty::New(true) );
 
             m_WorkingNode->SetData(m_WorkingSlice);
         }
 
     }
 
     if(!m_ToolManager->GetDataStorage()->Exists(m_WorkingNode))
     {
 
         m_WorkingNode->SetProperty( "outline binary", mitk::BoolProperty::New(true) );
         m_WorkingNode->SetProperty( "color", workingNode->GetProperty("color") );
         m_WorkingNode->SetProperty( "name", mitk::StringProperty::New("Paintbrush_Node") );
         m_WorkingNode->SetProperty( "helper object", mitk::BoolProperty::New(true) );
         m_WorkingNode->SetProperty( "opacity", mitk::FloatProperty::New(0.8) );
         m_WorkingNode->SetProperty( "includeInBoundingBox", mitk::BoolProperty::New(false));
 
         m_ToolManager->GetDataStorage()->Add(m_WorkingNode);
     }
 }
diff --git a/Modules/Segmentation/Interactions/mitkSegTool2D.cpp b/Modules/Segmentation/Interactions/mitkSegTool2D.cpp
index f5c4e58c22..53084af156 100644
--- a/Modules/Segmentation/Interactions/mitkSegTool2D.cpp
+++ b/Modules/Segmentation/Interactions/mitkSegTool2D.cpp
@@ -1,402 +1,403 @@
 /*===================================================================
 
 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 "mitkSegTool2D.h"
 #include "mitkToolManager.h"
 
 #include "mitkDataStorage.h"
 #include "mitkBaseRenderer.h"
 
 #include "mitkPlaneGeometry.h"
 
 #include "mitkExtractImageFilter.h"
 #include "mitkExtractDirectedPlaneImageFilter.h"
 
 //Include of the new ImageExtractor
 #include "mitkExtractDirectedPlaneImageFilterNew.h"
 #include "mitkPlanarCircle.h"
 #include "mitkOverwriteSliceImageFilter.h"
 #include "mitkOverwriteDirectedPlaneImageFilter.h"
 
 #include "mitkGetModuleContext.h"
 
 //Includes for 3DSurfaceInterpolation
 #include "mitkImageToContourFilter.h"
 #include "mitkSurfaceInterpolationController.h"
 
 
 #define ROUND(a)     ((a)>0 ? (int)((a)+0.5) : -(int)(0.5-(a)))
 
 mitk::SegTool2D::SegTool2D(const char* type)
 :Tool(type),
  m_LastEventSender(NULL),
  m_LastEventSlice(0),
  m_Contourmarkername ("Position"),
  m_ShowMarkerNodes (true),
  m_3DInterpolationEnabled (true)
 {
   // great magic numbers
   CONNECT_ACTION( 80, OnMousePressed );
   CONNECT_ACTION( 90, OnMouseMoved );
   CONNECT_ACTION( 42, OnMouseReleased );
   CONNECT_ACTION( 49014, OnInvertLogic );
 }
 
 mitk::SegTool2D::~SegTool2D()
 {
 }
 
 bool mitk::SegTool2D::OnMousePressed (Action*, const StateEvent* stateEvent)
 {
   const PositionEvent* positionEvent = dynamic_cast<const PositionEvent*>(stateEvent->GetEvent());
   if (!positionEvent) return false;
 
   if ( positionEvent->GetSender()->GetMapperID() != BaseRenderer::Standard2D ) return false; // we don't want anything but 2D
 
   m_LastEventSender = positionEvent->GetSender();
   m_LastEventSlice = m_LastEventSender->GetSlice();
 
   return true;
 }
 
 bool mitk::SegTool2D::OnMouseMoved   (Action*, const StateEvent* stateEvent)
 {
   const PositionEvent* positionEvent = dynamic_cast<const PositionEvent*>(stateEvent->GetEvent());
   if (!positionEvent) return false;
 
   if ( m_LastEventSender != positionEvent->GetSender() ) return false;
   if ( m_LastEventSlice  != m_LastEventSender->GetSlice() ) return false;
 
   return true;
 }
 
 bool mitk::SegTool2D::OnMouseReleased(Action*, const StateEvent* stateEvent)
 {
   const PositionEvent* positionEvent = dynamic_cast<const PositionEvent*>(stateEvent->GetEvent());
   if (!positionEvent) return false;
 
   if ( m_LastEventSender != positionEvent->GetSender() ) return false;
   if ( m_LastEventSlice  != m_LastEventSender->GetSlice() ) return false;
 
   return true;
 }
 
 bool mitk::SegTool2D::OnInvertLogic(Action*, const StateEvent* stateEvent)
 {
   const PositionEvent* positionEvent = dynamic_cast<const PositionEvent*>(stateEvent->GetEvent());
   if (!positionEvent) return false;
 
   if ( m_LastEventSender != positionEvent->GetSender() ) return false;
   if ( m_LastEventSlice  != m_LastEventSender->GetSlice() ) return false;
 
   return true;
 }
 
 bool mitk::SegTool2D::DetermineAffectedImageSlice( const Image* image, const PlaneGeometry* plane, int& affectedDimension, int& affectedSlice )
 {
   assert(image);
   assert(plane);
 
   // compare normal of plane to the three axis vectors of the image
   Vector3D normal       = plane->GetNormal();
   Vector3D imageNormal0 = image->GetSlicedGeometry()->GetAxisVector(0);
   Vector3D imageNormal1 = image->GetSlicedGeometry()->GetAxisVector(1);
   Vector3D imageNormal2 = image->GetSlicedGeometry()->GetAxisVector(2);
 
   normal.Normalize();
   imageNormal0.Normalize();
   imageNormal1.Normalize();
   imageNormal2.Normalize();
 
   imageNormal0.Set_vnl_vector( vnl_cross_3d<ScalarType>(normal.Get_vnl_vector(),imageNormal0.Get_vnl_vector()) );
   imageNormal1.Set_vnl_vector( vnl_cross_3d<ScalarType>(normal.Get_vnl_vector(),imageNormal1.Get_vnl_vector()) );
   imageNormal2.Set_vnl_vector( vnl_cross_3d<ScalarType>(normal.Get_vnl_vector(),imageNormal2.Get_vnl_vector()) );
 
   double eps( 0.00001 );
   // transversal
   if ( imageNormal2.GetNorm() <= eps )
   {
     affectedDimension = 2;
   }
   // sagittal
   else if ( imageNormal1.GetNorm() <= eps )
   {
     affectedDimension = 1;
   }
   // frontal
   else if ( imageNormal0.GetNorm() <= eps )
   {
     affectedDimension = 0;
   }
   else
   {
     affectedDimension = -1; // no idea
     return false;
   }
 
   // determine slice number in image
   Geometry3D* imageGeometry = image->GetGeometry(0);
   Point3D testPoint = imageGeometry->GetCenter();
   Point3D projectedPoint;
   plane->Project( testPoint, projectedPoint );
 
   Point3D indexPoint;
 
   imageGeometry->WorldToIndex( projectedPoint, indexPoint );
   affectedSlice = ROUND( indexPoint[affectedDimension] );
   MITK_DEBUG << "indexPoint " << indexPoint << " affectedDimension " << affectedDimension << " affectedSlice " << affectedSlice;
 
   // check if this index is still within the image
   if ( affectedSlice < 0 || affectedSlice >= static_cast<int>(image->GetDimension(affectedDimension)) ) return false;
 
   return true;
 }
 
 mitk::Image::Pointer mitk::SegTool2D::GetAffectedImageSliceAs2DImage(const PositionEvent* positionEvent, const Image* image)
 {
   if (!positionEvent) return NULL;
 
   assert( positionEvent->GetSender() ); // sure, right?
   unsigned int timeStep = positionEvent->GetSender()->GetTimeStep( image ); // get the timestep of the visible part (time-wise) of the image
 
   // first, we determine, which slice is affected
   const PlaneGeometry* planeGeometry( dynamic_cast<const PlaneGeometry*> (positionEvent->GetSender()->GetCurrentWorldGeometry2D() ) );
 
   if ( !image || !planeGeometry ) return NULL;
 
   int affectedDimension( -1 );
   int affectedSlice( -1 );
   //DetermineAffectedImageSlice( image, planeGeometry, affectedDimension, affectedSlice );
   if ( DetermineAffectedImageSlice( image, planeGeometry, affectedDimension, affectedSlice ) )
   {
     try
     {
       // now we extract the correct slice from the volume, resulting in a 2D image
       ExtractImageFilter::Pointer extractor= ExtractImageFilter::New();
       extractor->SetInput( image );
       extractor->SetSliceDimension( affectedDimension );
       extractor->SetSliceIndex( affectedSlice );
       extractor->SetTimeStep( timeStep );
       extractor->Update();
 
       // here we have a single slice that can be modified
       Image::Pointer slice = extractor->GetOutput();
 
       //Workaround because of bug #7079
       Point3D origin = slice->GetGeometry()->GetOrigin();
 
       int affectedDimension(-1);
 
       if(positionEvent->GetSender()->GetRenderWindow() == mitk::BaseRenderer::GetRenderWindowByName("stdmulti.widget1"))
       {
           affectedDimension = 2;
       }
       if(positionEvent->GetSender()->GetRenderWindow() == mitk::BaseRenderer::GetRenderWindowByName("stdmulti.widget2"))
       {
           affectedDimension = 0;
       }
       if(positionEvent->GetSender()->GetRenderWindow() == mitk::BaseRenderer::GetRenderWindowByName("stdmulti.widget3"))
       {
           affectedDimension = 1;
       }
 
       if (affectedDimension != -1)
       {
           origin[affectedDimension] = planeGeometry->GetOrigin()[affectedDimension];
           slice->GetGeometry()->SetOrigin(origin);
       }
       //Workaround end
 
       return slice;
     }
     catch(...)
     {
       // not working
       return NULL;
     }
   }
   else
   {
     ExtractDirectedPlaneImageFilterNew::Pointer newExtractor = ExtractDirectedPlaneImageFilterNew::New();
     newExtractor->SetInput( image );
     newExtractor->SetActualInputTimestep( timeStep );
     newExtractor->SetCurrentWorldGeometry2D( planeGeometry );
     newExtractor->Update();
     Image::Pointer slice = newExtractor->GetOutput();
     return slice;
   }
 }
 
 mitk::Image::Pointer mitk::SegTool2D::GetAffectedWorkingSlice(const PositionEvent* positionEvent)
 {
   DataNode* workingNode( m_ToolManager->GetWorkingData(0) );
   if ( !workingNode ) return NULL;
 
   Image* workingImage = dynamic_cast<Image*>(workingNode->GetData());
   if ( !workingImage ) return NULL;
 
   return GetAffectedImageSliceAs2DImage( positionEvent, workingImage );
 }
 
 mitk::Image::Pointer mitk::SegTool2D::GetAffectedReferenceSlice(const PositionEvent* positionEvent)
 {
   DataNode* referenceNode( m_ToolManager->GetReferenceData(0) );
   if ( !referenceNode ) return NULL;
 
   Image* referenceImage = dynamic_cast<Image*>(referenceNode->GetData());
   if ( !referenceImage ) return NULL;
 
   return GetAffectedImageSliceAs2DImage( positionEvent, referenceImage );
 }
 
 void mitk::SegTool2D::WriteBackSegmentationResult (const PositionEvent* positionEvent, Image* slice)
 {
   const PlaneGeometry* planeGeometry( dynamic_cast<const PlaneGeometry*> (positionEvent->GetSender()->GetCurrentWorldGeometry2D() ) );
 
   DataNode* workingNode( m_ToolManager->GetWorkingData(0) );
   Image* image = dynamic_cast<Image*>(workingNode->GetData());
 
   int affectedDimension( -1 );
   int affectedSlice( -1 );
   DetermineAffectedImageSlice( image, planeGeometry, affectedDimension, affectedSlice );
 
   if (affectedDimension != -1) {
     OverwriteSliceImageFilter::Pointer slicewriter = OverwriteSliceImageFilter::New();
     slicewriter->SetInput( image );
     slicewriter->SetCreateUndoInformation( true );
     slicewriter->SetSliceImage( slice );
     slicewriter->SetSliceDimension( affectedDimension );
     slicewriter->SetSliceIndex( affectedSlice );
     slicewriter->SetTimeStep( positionEvent->GetSender()->GetTimeStep( image ) );
     slicewriter->Update();
   }
   else {
     OverwriteDirectedPlaneImageFilter::Pointer slicewriter = OverwriteDirectedPlaneImageFilter::New();
     slicewriter->SetInput( image );
     slicewriter->SetCreateUndoInformation( false );
     slicewriter->SetSliceImage( slice );
     slicewriter->SetPlaneGeometry3D( slice->GetGeometry() );
     slicewriter->SetTimeStep( positionEvent->GetSender()->GetTimeStep( image ) );
     slicewriter->Update();
   }
   if ( m_3DInterpolationEnabled )
   {
     slice->DisconnectPipeline();
     ImageToContourFilter::Pointer contourExtractor = ImageToContourFilter::New();
     contourExtractor->SetInput(slice);
     contourExtractor->Update();
     mitk::Surface::Pointer contour = contourExtractor->GetOutput();
 
     if (contour->GetVtkPolyData()->GetNumberOfPoints() > 0 )
     {
       unsigned int pos = this->AddContourmarker(positionEvent);
       mitk::ServiceReference serviceRef = mitk::GetModuleContext()->GetServiceReference<PlanePositionManagerService>();
       PlanePositionManagerService* service = dynamic_cast<PlanePositionManagerService*>(mitk::GetModuleContext()->GetService(serviceRef));
       mitk::SurfaceInterpolationController::GetInstance()->AddNewContour( contour, service->GetPlanePosition(pos));
       contour->DisconnectPipeline();
     }
 
   }
+  mitk::RenderingManager::GetInstance()->RequestUpdateAll();
 }
 
 void mitk::SegTool2D::SetShowMarkerNodes(bool status)
 {
     m_ShowMarkerNodes = status;
 }
 
 void mitk::SegTool2D::Enable3DInterpolation(bool status)
 {
     m_3DInterpolationEnabled = status;
 }
 
 unsigned int mitk::SegTool2D::AddContourmarker ( const PositionEvent* positionEvent )
 {
   const mitk::Geometry2D* plane = dynamic_cast<const Geometry2D*> (dynamic_cast< const mitk::SlicedGeometry3D*>(
     positionEvent->GetSender()->GetSliceNavigationController()->GetCurrentGeometry3D())->GetGeometry2D(0));
 
   mitk::ServiceReference serviceRef = mitk::GetModuleContext()->GetServiceReference<PlanePositionManagerService>();
   PlanePositionManagerService* service = dynamic_cast<PlanePositionManagerService*>(mitk::GetModuleContext()->GetService(serviceRef));
   unsigned int size = service->GetNumberOfPlanePositions();
   unsigned int id = service->AddNewPlanePosition(plane, positionEvent->GetSender()->GetSliceNavigationController()->GetSlice()->GetPos());
 
   mitk::PlanarCircle::Pointer contourMarker = mitk::PlanarCircle::New();
   contourMarker->SetGeometry2D( const_cast<Geometry2D*>(plane));
 
   std::stringstream markerStream;
   mitk::DataNode* workingNode (m_ToolManager->GetWorkingData(0));
 
   markerStream << m_Contourmarkername ;
   markerStream << " ";
   markerStream << id+1;
 
   DataNode::Pointer rotatedContourNode = DataNode::New();
 
   rotatedContourNode->SetData(contourMarker);
   rotatedContourNode->SetProperty( "name", StringProperty::New(markerStream.str()) );
   rotatedContourNode->SetProperty( "isContourMarker", BoolProperty::New(true));
   rotatedContourNode->SetBoolProperty( "PlanarFigureInitializedWindow", true, positionEvent->GetSender() );
   rotatedContourNode->SetProperty( "includeInBoundingBox", BoolProperty::New(false));
   rotatedContourNode->SetProperty( "helper object", mitk::BoolProperty::New(!m_ShowMarkerNodes));
 
   if (plane)
   {
 
     if ( id ==  size )
     {
       m_ToolManager->GetDataStorage()->Add(rotatedContourNode, workingNode);
     }
     else
     {
         mitk::NodePredicateProperty::Pointer isMarker = mitk::NodePredicateProperty::New("isContourMarker", mitk::BoolProperty::New(true));
 
         mitk::DataStorage::SetOfObjects::ConstPointer markers = m_ToolManager->GetDataStorage()->GetDerivations(workingNode,isMarker);
 
         for ( mitk::DataStorage::SetOfObjects::const_iterator iter = markers->begin();
           iter != markers->end();
           ++iter)
         {
             std::string nodeName = (*iter)->GetName();
             unsigned int t = nodeName.find_last_of(" ");
             unsigned int markerId = atof(nodeName.substr(t+1).c_str())-1;
             if(id == markerId)
             {
                 return id;
             }
         }
         m_ToolManager->GetDataStorage()->Add(rotatedContourNode, workingNode);
     }
   }
   return id;
 }
 
 void mitk::SegTool2D::InteractiveSegmentationBugMessage( const std::string& message )
 {
   MITK_ERROR << "********************************************************************************" << std::endl
     << " " << message << std::endl
     << "********************************************************************************" << std::endl
     << "  " << std::endl
     << " If your image is rotated or the 2D views don't really contain the patient image, try to press the button next to the image selection. " << std::endl
     << "  " << std::endl
     << " Please file a BUG REPORT: " << std::endl
     << " http://bugs.mitk.org" << std::endl
     << " Contain the following information:" << std::endl
     << "  - What image were you working on?" << std::endl
     << "  - Which region of the image?" << std::endl
     << "  - Which tool did you use?" << std::endl
     << "  - What did you do?" << std::endl
     << "  - What happened (not)? What did you expect?" << std::endl;
 }
 
diff --git a/Modules/Segmentation/Interactions/mitkSetRegionTool.cpp b/Modules/Segmentation/Interactions/mitkSetRegionTool.cpp
index 13567091ee..a4f50649e3 100644
--- a/Modules/Segmentation/Interactions/mitkSetRegionTool.cpp
+++ b/Modules/Segmentation/Interactions/mitkSetRegionTool.cpp
@@ -1,314 +1,310 @@
 /*===================================================================
 
 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 "mitkSetRegionTool.h"
 
 #include "mitkToolManager.h"
 #include "mitkOverwriteSliceImageFilter.h"
 
 #include "ipSegmentation.h"
 
 #include "mitkBaseRenderer.h"
 #include "mitkImageDataItem.h"
 
 #include "mitkOverwriteDirectedPlaneImageFilter.h"
 
 mitk::SetRegionTool::SetRegionTool(int paintingPixelValue)
 :FeedbackContourTool("PressMoveReleaseWithCTRLInversion"),
  m_PaintingPixelValue(paintingPixelValue),
  m_FillContour(false),
  m_StatusFillWholeSlice(false)
 {
 }
 
 mitk::SetRegionTool::~SetRegionTool()
 {
 }
 
 void mitk::SetRegionTool::Activated()
 {
   Superclass::Activated();
 }
 
 void mitk::SetRegionTool::Deactivated()
 {
   Superclass::Deactivated();
 }
 
 bool mitk::SetRegionTool::OnMousePressed (Action* action, const StateEvent* stateEvent)
 {
   if (!FeedbackContourTool::OnMousePressed( action, stateEvent )) return false;
 
   const PositionEvent* positionEvent = dynamic_cast<const PositionEvent*>(stateEvent->GetEvent());
   if (!positionEvent) return false;
 
   // 1. Get the working image
   Image::Pointer workingSlice   = FeedbackContourTool::GetAffectedWorkingSlice( positionEvent );
   if ( workingSlice.IsNull() ) return false; // can't do anything without the segmentation
  
   // if click was outside the image, don't continue
   const Geometry3D* sliceGeometry = workingSlice->GetGeometry();
   itk::Index<2> projectedPointIn2D;
   sliceGeometry->WorldToIndex( positionEvent->GetWorldPosition(), projectedPointIn2D );
   if ( !sliceGeometry->IsIndexInside( projectedPointIn2D ) )
   {
     MITK_ERROR << "point apparently not inside segmentation slice" << std::endl;
     return false; // can't use that as a seed point
   }
   
     // Convert to ipMITKSegmentationTYPE (because ipMITKSegmentationGetContour8N relys on that data type)
     itk::Image< ipMITKSegmentationTYPE, 2 >::Pointer correctPixelTypeImage;
     CastToItkImage( workingSlice, correctPixelTypeImage );
     assert (correctPixelTypeImage.IsNotNull() );
 
   // possible bug in CastToItkImage ?
   // direction maxtrix is wrong/broken/not working after CastToItkImage, leading to a failed assertion in
   // mitk/Core/DataStructures/mitkSlicedGeometry3D.cpp, 479:
   // virtual void mitk::SlicedGeometry3D::SetSpacing(const mitk::Vector3D&): Assertion `aSpacing[0]>0 && aSpacing[1]>0 && aSpacing[2]>0' failed
   // solution here: we overwrite it with an unity matrix
   itk::Image< ipMITKSegmentationTYPE, 2 >::DirectionType imageDirection;
   imageDirection.SetIdentity();
   correctPixelTypeImage->SetDirection(imageDirection);
 
     Image::Pointer temporarySlice = Image::New();
   //  temporarySlice = ImportItkImage( correctPixelTypeImage );
     CastToMitkImage( correctPixelTypeImage, temporarySlice );
 
 
   // check index positions
   mitkIpPicDescriptor* originalPicSlice = mitkIpPicNew();
   CastToIpPicDescriptor( temporarySlice, originalPicSlice );
 
   int m_SeedPointMemoryOffset = projectedPointIn2D[1] * originalPicSlice->n[0] + projectedPointIn2D[0];
 
   if ( m_SeedPointMemoryOffset >= static_cast<int>( originalPicSlice->n[0] * originalPicSlice->n[1] ) ||
        m_SeedPointMemoryOffset < 0 )
   {
     MITK_ERROR << "Memory offset calculation if mitk::SetRegionTool has some serious flaw! Aborting.." << std::endl;
     return false;
   }
   
   // 2. Determine the contour that surronds the selected "piece of the image"
   
   // find a contour seed point
   unsigned int oneContourOffset = static_cast<unsigned int>( m_SeedPointMemoryOffset ); // safe because of earlier check if m_SeedPointMemoryOffset < 0
 
   /** 
     * The logic of finding a starting point for the contour is the following:
     * 
     *  - If the initial seed point is 0, we are either inside a hole or outside of every segmentation.
     *    We move to the right until we hit a 1, which must be part of a contour. 
     *
     *  - If the initial seed point is 1, then ...
     *    we now do the same (running to the right) until we hit a 1
     *
     *  In both cases the found contour point is used to extract a contour and
     *  then a test is applied to find out if the initial seed point is contained
     *  in the contour. If this is the case, filling should be applied, otherwise
     *  nothing is done.
     */
   unsigned int size = originalPicSlice->n[0] * originalPicSlice->n[1];
 /*
   unsigned int rowSize = originalPicSlice->n[0];
 */
   ipMITKSegmentationTYPE* data = static_cast<ipMITKSegmentationTYPE*>(originalPicSlice->data);
 
   if ( data[oneContourOffset] == 0 ) // initial seed 0
   {
     for ( ; oneContourOffset < size; ++oneContourOffset )
     {
       if ( data[oneContourOffset] > 0 ) break;
     }
   }
   else if ( data[oneContourOffset] == 1 ) // initial seed 1
   {
     unsigned int lastValidPixel = size-1; // initialization, will be changed lateron
     bool inSeg = true;    // inside segmentation?
     for ( ; oneContourOffset < size; ++oneContourOffset )
     {
       if ( ( data[oneContourOffset] == 0 ) && inSeg ) // pixel 0 and inside-flag set: this happens at the first pixel outside a filled region
       {
         inSeg = false;
         lastValidPixel = oneContourOffset - 1; // store the last pixel position inside a filled region
         break;
       }
       else // pixel 1, inside-flag doesn't matter: this happens while we are inside a filled region
       {
         inSeg = true; // first iteration lands here
       }
       
     }
     oneContourOffset = lastValidPixel;
   }
   else
   {
     MITK_ERROR << "Fill/Erase was never intended to work with other than binary images." << std::endl;
     m_FillContour = false;
     return false;
   }
 
   if (oneContourOffset == size) // nothing found until end of slice
   {
     m_FillContour = false;
     return false;
   }
   
   int numberOfContourPoints( 0 );
   int newBufferSize( 0 );
   //MITK_INFO << "getting contour from offset " << oneContourOffset << " ("<<oneContourOffset%originalPicSlice->n[0]<<","<<oneContourOffset/originalPicSlice->n[0]<<")"<<std::endl;
   float* contourPoints = ipMITKSegmentationGetContour8N( originalPicSlice, oneContourOffset, numberOfContourPoints, newBufferSize ); // memory allocated with malloc
   
   //MITK_INFO << "contourPoints " << contourPoints << " (N="<<numberOfContourPoints<<")"<<std::endl;
   assert(contourPoints == NULL || numberOfContourPoints > 0);
     
   bool cursorInsideContour = ipMITKSegmentationIsInsideContour( contourPoints, numberOfContourPoints, projectedPointIn2D[0], projectedPointIn2D[1]);
 
   // decide if contour should be filled or not
   m_FillContour = cursorInsideContour;
 
   if (m_FillContour)
   {
     // copy point from float* to mitk::Contour 
     Contour::Pointer contourInImageIndexCoordinates = Contour::New();
     contourInImageIndexCoordinates->Initialize();
     Point3D newPoint;
     for (int index = 0; index < numberOfContourPoints; ++index)
     {
       newPoint[0] = contourPoints[ 2 * index + 0 ];
       newPoint[1] = contourPoints[ 2 * index + 1];
       newPoint[2] = 0;
 
       contourInImageIndexCoordinates->AddVertex( newPoint - 0.5 );
     }
 
     m_SegmentationContourInWorldCoordinates = FeedbackContourTool::BackProjectContourFrom2DSlice( workingSlice->GetGeometry(), contourInImageIndexCoordinates, true ); // true, correct the result from ipMITKSegmentationGetContour8N
 
     // 3. Show the contour
     FeedbackContourTool::SetFeedbackContour( *m_SegmentationContourInWorldCoordinates );
     
     FeedbackContourTool::SetFeedbackContourVisible(true);
     mitk::RenderingManager::GetInstance()->RequestUpdate(positionEvent->GetSender()->GetRenderWindow());
   }
 
   // always generate a second contour, containing the whole image (used when CTRL is pressed)
   {
     // copy point from float* to mitk::Contour 
     Contour::Pointer contourInImageIndexCoordinates = Contour::New();
     contourInImageIndexCoordinates->Initialize();
     Point3D newPoint;
     newPoint[0] = 0; newPoint[1] = 0; newPoint[2] = 0.0;
     contourInImageIndexCoordinates->AddVertex( newPoint );
     newPoint[0] = originalPicSlice->n[0]; newPoint[1] = 0; newPoint[2] = 0.0;
     contourInImageIndexCoordinates->AddVertex( newPoint );
     newPoint[0] = originalPicSlice->n[0]; newPoint[1] = originalPicSlice->n[1]; newPoint[2] = 0.0;
     contourInImageIndexCoordinates->AddVertex( newPoint );
     newPoint[0] = 0; newPoint[1] = originalPicSlice->n[1]; newPoint[2] = 0.0;
     contourInImageIndexCoordinates->AddVertex( newPoint );
 
     m_WholeImageContourInWorldCoordinates = FeedbackContourTool::BackProjectContourFrom2DSlice( workingSlice->GetGeometry(), contourInImageIndexCoordinates, true ); // true, correct the result from ipMITKSegmentationGetContour8N
 
     // 3. Show the contour
     FeedbackContourTool::SetFeedbackContour( *m_SegmentationContourInWorldCoordinates );
     
     FeedbackContourTool::SetFeedbackContourVisible(true);
     mitk::RenderingManager::GetInstance()->RequestUpdate(positionEvent->GetSender()->GetRenderWindow());
   }
 
 
   free(contourPoints);
 
   return true;
 }
 
 bool mitk::SetRegionTool::OnMouseReleased(Action* action, const StateEvent* stateEvent)
 {
   // 1. Hide the feedback contour, find out which slice the user clicked, find out which slice of the toolmanager's working image corresponds to that
   FeedbackContourTool::SetFeedbackContourVisible(false);
   
   const PositionEvent* positionEvent = dynamic_cast<const PositionEvent*>(stateEvent->GetEvent());
   if (!positionEvent) return false;
 
   assert( positionEvent->GetSender()->GetRenderWindow() );
   mitk::RenderingManager::GetInstance()->RequestUpdate(positionEvent->GetSender()->GetRenderWindow());
   
   if (!m_FillContour && !m_StatusFillWholeSlice) return true;
   
   if (!FeedbackContourTool::OnMouseReleased( action, stateEvent )) return false;
 
   DataNode* workingNode( m_ToolManager->GetWorkingData(0) );
   if (!workingNode) return false;
 
   Image* image = dynamic_cast<Image*>(workingNode->GetData());
   const PlaneGeometry* planeGeometry( dynamic_cast<const PlaneGeometry*> (positionEvent->GetSender()->GetCurrentWorldGeometry2D() ) );
   if ( !image || !planeGeometry ) return false;
 
   Image::Pointer slice = FeedbackContourTool::GetAffectedImageSliceAs2DImage( positionEvent, image );
 
   if ( slice.IsNull() )
   {
       MITK_ERROR << "Unable to extract slice." << std::endl;
       return false;
   }
 
   Contour* feedbackContour( FeedbackContourTool::GetFeedbackContour() );
   Contour::Pointer projectedContour = FeedbackContourTool::ProjectContourTo2DSlice( slice, feedbackContour, false, false ); // false: don't add 0.5 (done by FillContourInSlice)
   // false: don't constrain the contour to the image's inside
   if (projectedContour.IsNull()) return false;
 
   FeedbackContourTool::FillContourInSlice( projectedContour, slice, m_PaintingPixelValue );
 
   this->WriteBackSegmentationResult(positionEvent, slice);
 
-  // 6. Make sure the result is drawn again --> is visible then. 
-  assert( positionEvent->GetSender()->GetRenderWindow() );
-  mitk::RenderingManager::GetInstance()->RequestUpdate(positionEvent->GetSender()->GetRenderWindow());
-
   m_WholeImageContourInWorldCoordinates = NULL;
   m_SegmentationContourInWorldCoordinates = NULL;
 
   return true;
 }
 
 /**
   Called when the CTRL key is pressed. Will change the painting pixel value from 0 to 1 or from 1 to 0. 
 */
 bool mitk::SetRegionTool::OnInvertLogic(Action* action, const StateEvent* stateEvent)
 {
   if (!FeedbackContourTool::OnInvertLogic(action, stateEvent)) return false;
   
   const PositionEvent* positionEvent = dynamic_cast<const PositionEvent*>(stateEvent->GetEvent());
   if (!positionEvent) return false;
 
   if (m_StatusFillWholeSlice)
   {
     // use contour extracted from image data
     if (m_SegmentationContourInWorldCoordinates.IsNotNull())
       FeedbackContourTool::SetFeedbackContour( *m_SegmentationContourInWorldCoordinates );
     mitk::RenderingManager::GetInstance()->RequestUpdate(positionEvent->GetSender()->GetRenderWindow());
   } 
   else
   {
     // use some artificial contour
     if (m_WholeImageContourInWorldCoordinates.IsNotNull())
       FeedbackContourTool::SetFeedbackContour( *m_WholeImageContourInWorldCoordinates );
     mitk::RenderingManager::GetInstance()->RequestUpdate(positionEvent->GetSender()->GetRenderWindow());
   }
 
   m_StatusFillWholeSlice = !m_StatusFillWholeSlice;
 
   return true;
 }
 
diff --git a/Plugins/org.mitk.core.services/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.core.services/src/internal/mitkPluginActivator.cpp
index 30d39d3ded..91dc708941 100644
--- a/Plugins/org.mitk.core.services/src/internal/mitkPluginActivator.cpp
+++ b/Plugins/org.mitk.core.services/src/internal/mitkPluginActivator.cpp
@@ -1,40 +1,258 @@
 /*===================================================================
 
 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 "mitkPluginActivator.h"
 
 #include "internal/mitkDataStorageService.h"
 
+#include <mitkModuleRegistry.h>
+#include <mitkModule.h>
+#include <mitkModuleContext.h>
+
+
 namespace mitk
 {
 
+class ITKLightObjectToQObjectAdapter : public QObject
+{
+
+public:
+
+  ITKLightObjectToQObjectAdapter(const QStringList& clazzes, itk::LightObject* service)
+    : interfaceNames(clazzes), mitkService(service)
+  {}
+
+  // This method is called by the Qt meta object system. It is usually
+  // generated by the moc, but we create it manually to be able to return
+  // a MITK micro service object (derived from itk::LightObject). It basically
+  // works as if the micro service class had used the Q_INTERFACES macro in
+  // its declaration. Now we can successfully do a
+  // qobject_cast<mitk::SomeMicroServiceInterface>(lightObjectToQObjectAdapter)
+  void* qt_metacast(const char *_clname)
+  {
+    if (!_clname) return 0;
+    if (!strcmp(_clname, "ITKLightObjectToQObjectAdapter"))
+      return static_cast<void*>(const_cast<ITKLightObjectToQObjectAdapter*>(this));
+    if (interfaceNames.contains(QString(_clname)))
+      return static_cast<void*>(mitkService);
+    return QObject::qt_metacast(_clname);
+  }
+
+private:
+
+  QStringList interfaceNames;
+  itk::LightObject* mitkService;
+};
+
 const std::string org_mitk_core_services_Activator::PLUGIN_ID = "org.mitk.core.services";
 
 void org_mitk_core_services_Activator::start(ctkPluginContext* context)
 {
+  pluginContext = context;
+
   DataStorageService* service = new DataStorageService();
   dataStorageService = IDataStorageService::Pointer(service);
   context->registerService<mitk::IDataStorageService>(service);
+
+  // Get the MitkCore Module Context
+  mitkContext = mitk::ModuleRegistry::GetModule(1)->GetModuleContext();
+
+  // Process all already registered services
+  std::list<mitk::ServiceReference> refs = mitkContext->GetServiceReferences("");
+  for (std::list<mitk::ServiceReference>::const_iterator i = refs.begin();
+       i != refs.end(); ++i)
+  {
+    this->AddMitkService(*i);
+  }
+
+  mitkContext->AddServiceListener(this, &org_mitk_core_services_Activator::MitkServiceChanged);
 }
 
 void org_mitk_core_services_Activator::stop(ctkPluginContext* /*context*/)
 {
+  mitkContext->RemoveServiceListener(this, &org_mitk_core_services_Activator::MitkServiceChanged);
+
+  foreach(ctkServiceRegistration reg, mapMitkIdToRegistration.values())
+  {
+    reg.unregister();
+  }
+  mapMitkIdToRegistration.clear();
+
+  qDeleteAll(mapMitkIdToAdapter);
+  mapMitkIdToAdapter.clear();
+
   dataStorageService = 0;
+  mitkContext = 0;
+  pluginContext = 0;
+}
+
+void org_mitk_core_services_Activator::MitkServiceChanged(const mitk::ServiceEvent event)
+{
+  switch (event.GetType())
+  {
+  case mitk::ServiceEvent::REGISTERED:
+  {
+    this->AddMitkService(event.GetServiceReference());
+    break;
+  }
+  case mitk::ServiceEvent::UNREGISTERING:
+  {
+    long mitkServiceId = mitk::any_cast<long>(event.GetServiceReference().GetProperty(mitk::ServiceConstants::SERVICE_ID()));
+    ctkServiceRegistration reg = mapMitkIdToRegistration.take(mitkServiceId);
+    if (reg)
+    {
+      reg.unregister();
+    }
+    delete mapMitkIdToAdapter.take(mitkServiceId);
+    break;
+  }
+  case mitk::ServiceEvent::MODIFIED:
+  {
+    long mitkServiceId = mitk::any_cast<long>(event.GetServiceReference().GetProperty(mitk::ServiceConstants::SERVICE_ID()));
+    ctkDictionary newProps = CreateServiceProperties(event.GetServiceReference());
+    mapMitkIdToRegistration[mitkServiceId].setProperties(newProps);
+    break;
+  }
+  default:
+    break; // do nothing
+  }
+}
+
+void org_mitk_core_services_Activator::AddMitkService(const mitk::ServiceReference& ref)
+{
+  // Get the MITK micro service object
+  itk::LightObject* mitkService = mitkContext->GetService(ref);
+  if (mitkService == 0) return;
+
+  // Get the interface names against which the service was registered
+  std::list<std::string> clazzes =
+      mitk::any_cast<std::list<std::string> >(ref.GetProperty(mitk::ServiceConstants::OBJECTCLASS()));
+
+  QStringList qclazzes;
+  for(std::list<std::string>::const_iterator clazz = clazzes.begin();
+      clazz != clazzes.end(); ++clazz)
+  {
+    qclazzes << QString::fromStdString(*clazz);
+  }
+
+  long mitkServiceId = mitk::any_cast<long>(ref.GetProperty(mitk::ServiceConstants::SERVICE_ID()));
+
+  QObject* adapter = new ITKLightObjectToQObjectAdapter(qclazzes, mitkService);
+  mapMitkIdToAdapter[mitkServiceId] = adapter;
+
+  ctkDictionary props = CreateServiceProperties(ref);
+  mapMitkIdToRegistration[mitkServiceId] = pluginContext->registerService(qclazzes, adapter, props);
+}
+
+ctkDictionary org_mitk_core_services_Activator::CreateServiceProperties(const ServiceReference &ref)
+{
+  ctkDictionary props;
+
+  long mitkServiceId = mitk::any_cast<long>(ref.GetProperty(mitk::ServiceConstants::SERVICE_ID()));
+  props.insert("mitk.serviceid", QVariant::fromValue(mitkServiceId));
+
+  // Add all other properties from the MITK micro service
+  std::vector<std::string> keys;
+  ref.GetPropertyKeys(keys);
+  for (std::vector<std::string>::const_iterator it = keys.begin(); it != keys.end(); ++it)
+  {
+    QString key = QString::fromStdString(*it);
+    mitk::Any value = ref.GetProperty(*it);
+    // We cannot add any mitk::Any object, we need to query the type
+    const std::type_info& objType = value.Type();
+    if (objType == typeid(std::string))
+    {
+      props.insert(key, QString::fromStdString(ref_any_cast<std::string>(value)));
+    }
+    else if (objType == typeid(std::vector<std::string>))
+    {
+      const std::vector<std::string>& list = ref_any_cast<std::vector<std::string> >(value);
+      QStringList qlist;
+      for (std::vector<std::string>::const_iterator str = list.begin();
+           str != list.end(); ++str)
+      {
+         qlist << QString::fromStdString(*str);
+      }
+      props.insert(key, qlist);
+    }
+    else if (objType == typeid(std::list<std::string>))
+    {
+      const std::list<std::string>& list = ref_any_cast<std::list<std::string> >(value);
+      QStringList qlist;
+      for (std::list<std::string>::const_iterator str = list.begin();
+           str != list.end(); ++str)
+      {
+         qlist << QString::fromStdString(*str);
+      }
+      props.insert(key, qlist);
+    }
+    else if (objType == typeid(char))
+    {
+      props.insert(key, QChar(ref_any_cast<char>(value)));
+    }
+    else if (objType == typeid(unsigned char))
+    {
+      props.insert(key, QChar(ref_any_cast<unsigned char>(value)));
+    }
+    else if (objType == typeid(bool))
+    {
+      props.insert(key, any_cast<bool>(value));
+    }
+    else if (objType == typeid(short))
+    {
+      props.insert(key, any_cast<short>(value));
+    }
+    else if (objType == typeid(unsigned short))
+    {
+      props.insert(key, any_cast<unsigned short>(value));
+    }
+    else if (objType == typeid(int))
+    {
+      props.insert(key, any_cast<int>(value));
+    }
+    else if (objType == typeid(unsigned int))
+    {
+      props.insert(key, any_cast<unsigned int>(value));
+    }
+    else if (objType == typeid(float))
+    {
+      props.insert(key, any_cast<float>(value));
+    }
+    else if (objType == typeid(double))
+    {
+      props.insert(key, any_cast<double>(value));
+    }
+    else if (objType == typeid(long long int))
+    {
+      props.insert(key, any_cast<long long int>(value));
+    }
+    else if (objType == typeid(unsigned long long int))
+    {
+      props.insert(key, any_cast<unsigned long long int>(value));
+    }
+  }
+
+  return props;
+}
+
+org_mitk_core_services_Activator::org_mitk_core_services_Activator()
+  : mitkContext(0), pluginContext(0)
+{
 }
 
 }
 
 Q_EXPORT_PLUGIN2(org_mitk_core_services, mitk::org_mitk_core_services_Activator)
diff --git a/Plugins/org.mitk.core.services/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.core.services/src/internal/mitkPluginActivator.h
index 2f80ac4e5e..3d558524ce 100644
--- a/Plugins/org.mitk.core.services/src/internal/mitkPluginActivator.h
+++ b/Plugins/org.mitk.core.services/src/internal/mitkPluginActivator.h
@@ -1,50 +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 MITKCORESERVICESPLUGIN_H_
 #define MITKCORESERVICESPLUGIN_H_
 
 #include <berryPlugin.h>
 #include <berryIBundleContext.h>
 
 #include "mitkIDataStorageService.h"
+#include <mitkServiceEvent.h>
 
 namespace mitk
 {
 
+class ModuleContext;
+
 class org_mitk_core_services_Activator : public QObject, public ctkPluginActivator
 {
   Q_OBJECT
   Q_INTERFACES(ctkPluginActivator)
 
 public:
   
   static const std::string PLUGIN_ID;
+
+  org_mitk_core_services_Activator();
   
   void start(ctkPluginContext* context);
   void stop(ctkPluginContext* context);
 
+  void MitkServiceChanged(const mitk::ServiceEvent event);
+
 private:
 
   mitk::IDataStorageService::Pointer dataStorageService;
+  QMap<long, QObject*> mapMitkIdToAdapter;
+  QMap<long, ctkServiceRegistration> mapMitkIdToRegistration;
+
+  mitk::ModuleContext* mitkContext;
+  ctkPluginContext* pluginContext;
   
+  void AddMitkService(const mitk::ServiceReference &ref);
+
+  ctkDictionary CreateServiceProperties(const mitk::ServiceReference& ref);
 };
 
 typedef org_mitk_core_services_Activator PluginActivator;
 
 }
 
 #endif /*MITKCORESERVICESPLUGIN_H_*/
diff --git a/Utilities/mbilog/mbilog.h b/Utilities/mbilog/mbilog.h
index 3c7206dcc6..abd102d095 100644
--- a/Utilities/mbilog/mbilog.h
+++ b/Utilities/mbilog/mbilog.h
@@ -1,225 +1,232 @@
 /*===================================================================
 
 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 _MBILOG_H
 #define _MBILOG_H
 
 #include <sstream>
 
 #include "mbilogExports.h"
 #include "mbilogBackendBase.h"
 #include "mbilogBackendCout.h"
 #include "mbilogLogMessage.h"
 #include "mbilogLoggingTypes.h"
 #include "mbilogConfig.h"
 
-
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable: 4251)
+#endif
 
 namespace mbilog {
 
   /** \brief Registeres a backend to the mbi logging mechanism. If a backend is registered here, all mbilog messages
    *         are relayed to this backend through the method ProcessMessage. If no backend is registered the default
    *         backend is used.
    */
   void MBILOG_DLL_API RegisterBackend(BackendBase* backend);
   
   /** \brief Unregisters a backend.
    */
   void MBILOG_DLL_API UnregisterBackend(BackendBase* backend);
   
   /** \brief Distributes the given message to all registered backends. Should only be called by objects 
     *        of the class pseudo stream.
     */
   void MBILOG_DLL_API DistributeToBackends(LogMessage &l);
 
   /**
    * \brief An object of this class simulates a std::cout stream. This means messages can be added by
    *        using the bit shift operator (<<). Should only be used by the macros defined in the file mbilog.h
    *  \ingroup mbilog
    */
   class MBILOG_DLL_API PseudoStream {
 
     protected:
 
       bool disabled;
       LogMessage msg;
       std::stringstream ss;
 
     public:
 
       inline PseudoStream( int level,
                     const char* filePath,
                     int lineNumber,
                     const char* functionName)
                           : disabled(false)
                           , msg(LogMessage(level,filePath,lineNumber,functionName))
                           , ss(std::stringstream::out)
       {
       }
 
       /** \brief The message which is stored in the member ss is written to the backend. */
       inline ~PseudoStream()
       {
         if(!disabled)
         {
           msg.message = ss.str();
           msg.moduleName = MBILOG_MODULENAME;
           DistributeToBackends(msg);
         }
       }
 
       /** \brief Definition of the bit shift operator for this class.*/
       template <class T> inline PseudoStream& operator<<(const T& data)
       {
         if(!disabled)
         {
           std::locale C("C");
           std::locale originalLocale = ss.getloc();
           ss.imbue(C);
 
           ss << data;
 
           ss.imbue( originalLocale );
         }
         return *this;
       }
 
       /** \brief Definition of the bit shift operator for this class (for non const data).*/
       template <class T> inline PseudoStream& operator<<(T& data)
       {
         if(!disabled)
         {
           std::locale C("C");
           std::locale originalLocale = ss.getloc();
           ss.imbue(C);
 
           ss << data;
 
           ss.imbue( originalLocale );
         }
         return *this;
       }
 
       /** \brief Definition of the bit shift operator for this class (for functions).*/
       inline PseudoStream& operator<<(std::ostream& (*func)(std::ostream&))
       {
         if(!disabled)
         {
           std::locale C("C");
           std::locale originalLocale = ss.getloc();
           ss.imbue(C);
 
           ss << func;
 
           ss.imbue( originalLocale );
         }
         return *this;
       }
 
       /** \brief Sets the category of this PseudoStream object. If there already is a category it is appended, seperated by a dot.*/
       inline PseudoStream& operator()(const char *category)
       {
         if(!disabled)
         {
           if(msg.category.length())
             msg.category+=".";
           msg.category+=category;
         }
         return *this;
       }
 
       /** \brief Enables/disables the PseudoStream. If set to false parsing and output is suppressed. */
       inline PseudoStream& operator()(bool enabled)
       {
         disabled|=!enabled;
         return *this;
       }
   };
 
   /** 
    * \brief An object of this class simulates a std::cout stream but does nothing. This class is for dummy objects, bit shift
    *        operators are availiable but doing nothing. Should only be used by the macros defined in the file mbilog.h
    * \ingroup mbilog
    */
   class MBILOG_DLL_API NullStream {
 
     public:
 
       template <class T> inline NullStream& operator<<(const T& /*data*/)
       {
         return *this;
       }
       template <class T> inline NullStream& operator<<(T& /*data*/)
       {
         return *this;
       }
       inline NullStream& operator<<(std::ostream& (*)(std::ostream&))
       {
         return *this;
       }
       inline NullStream& operator()(const char *)
       {
         return *this;
       }
       inline NullStream& operator()(bool)
       {
         return *this;
       }
   };
 
 //  /** \brief templated backend: one can define a class and a method to create a new backend. */
 //  template<typename T>
 //  struct DelegateBackend : public BackendBase
 //  {
 //
 //    typedef void(T::*Callback)(const mbilog::LogMessage&);
 //
 //    DelegateBackend(T* obj, Callback callback) : m_Obj(obj), m_Callback(callback)
 //    {
 //    }
 //
 //    void ProcessMessage(const mbilog::LogMessage& msg)
 //    {
 //      m_Obj->*m_Callback(msg);
 //    }
 //
 //  private:
 //
 //    T* m_Obj;
 //    Callback m_Callback;
 //  };
 
 
 }
 
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
 /** \brief Macros for different message levels. Creates an instance of class PseudoStream with the corresponding message level.
   *        Other parameters are the name of the source file, line of the source code and function name which are generated
   *        by the compiler.
   */
 #define MBI_INFO mbilog::PseudoStream(mbilog::Info,__FILE__,__LINE__,__FUNCTION__)
 #define MBI_WARN mbilog::PseudoStream(mbilog::Warn,__FILE__,__LINE__,__FUNCTION__)
 #define MBI_ERROR mbilog::PseudoStream(mbilog::Error,__FILE__,__LINE__,__FUNCTION__)
 #define MBI_FATAL mbilog::PseudoStream(mbilog::Fatal,__FILE__,__LINE__,__FUNCTION__)
 
 /** \brief Macro for the debug messages. The messages are disabled if the cmake variable MBILOG_ENABLE_DEBUG is false. */
 #ifdef MBILOG_ENABLE_DEBUG
 #define MBI_DEBUG mbilog::PseudoStream(mbilog::Debug,__FILE__,__LINE__,__FUNCTION__)
 #else
 #define MBI_DEBUG true ? mbilog::NullStream() : mbilog::NullStream() //this is magic by markus
 #endif
 
 
 #endif
diff --git a/Utilities/mbilog/mbilogLogMessage.h b/Utilities/mbilog/mbilogLogMessage.h
index e96b19804f..9305ca45ea 100644
--- a/Utilities/mbilog/mbilogLogMessage.h
+++ b/Utilities/mbilog/mbilogLogMessage.h
@@ -1,81 +1,89 @@
 /*===================================================================
 
 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 _mbilogLogMessage_H
 #define _mbilogLogMessage_H
 
 #include <string>
 
 #include "mbilogExports.h"
 
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable: 4251)
+#endif
+
 namespace mbilog{
 
  /** Documentation
   *  \brief An object of this class represents a single logging message (logging event) of the
   *  mbi logging mechanism. Logging message should only be generated by the macros in the class mbilog.h
   * 
   *  \ingroup mbilog
   */
  
 //todo convert to Struct
  class MBILOG_DLL_API LogMessage {
 
     public:
       //TODO: all member names m_[...]
   
       /** \brief Logging level which is defined in the enum mbilogLoggingTypes.h TODO: convert to enum.*/
       const int level;
   
       // the data of the following section is generated by the c-compiler
   
       /** \brief File name of the source file where the logging message was emitted which is generated by the macros in file mbilog.h*/
       const char* filePath;
       /** \brief Line of the source source file where the logging message was emitted which is generated by the macros in file mbilog.h*/
       const int lineNumber;
       /** \brief Name of the method where the logging message was emitted which is generated by the macros in file mbilog.h*/
       const char* functionName;
   
       // the data of the following section is generated by the mitk module system
   
       /** \brief Name of the module where the logging message was emitted which is generated by the macros in file mbilog.h. Is empty if there module defined.*/
       const char* moduleName;
   
       // user parameters
   
       /** \brief Category of the logging event, which was defined by the user.*/
       std::string category;
   
       /** \brief The actual logging message.*/
       std::string message;
 
       LogMessage(
         const int _level,
         const char* _filePath,
         const int _lineNumber,
         const char* _functionName
       )
         : level(_level)
         , filePath(_filePath)
         , lineNumber(_lineNumber)
         , functionName(_functionName)
       {
       }
   };
 
 }
 
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
 
 #endif