diff --git a/Modules/DiffusionImaging/FiberTracking/cmdapps/FiberProcessing/CMakeLists.txt b/Modules/DiffusionImaging/FiberTracking/cmdapps/FiberProcessing/CMakeLists.txt
index cf4af5cca2..e65098bb44 100755
--- a/Modules/DiffusionImaging/FiberTracking/cmdapps/FiberProcessing/CMakeLists.txt
+++ b/Modules/DiffusionImaging/FiberTracking/cmdapps/FiberProcessing/CMakeLists.txt
@@ -1,43 +1,43 @@
 option(BUILD_DiffusionFiberProcessingCmdApps "Build commandline tools for diffusion fiber processing" OFF)
 
 if(BUILD_DiffusionFiberProcessingCmdApps OR MITK_BUILD_ALL_APPS)
 
   # needed include directories
   include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     )
 
     # list of diffusion cmdapps
     # if an app requires additional dependencies
     # they are added after a "^^" and separated by "_"
     set( diffusionFiberProcessingcmdapps
     TractDensity^^MitkFiberTracking
     Sift2WeightCopy^^MitkFiberTracking
     FiberExtraction^^MitkFiberTracking
     FiberProcessing^^MitkFiberTracking
     FiberDirectionExtraction^^MitkFiberTracking
     FiberJoin^^MitkFiberTracking
     )
 
-    foreach(diffusionFiberProcessingcmdapp ${diffusiontractographycmdapps})
+    foreach(diffusionFiberProcessingcmdapp ${diffusionFiberProcessingcmdapps})
       # extract cmd app name and dependencies
       string(REPLACE "^^" "\\;" cmdapp_info ${diffusionFiberProcessingcmdapp})
       set(cmdapp_info_list ${cmdapp_info})
       list(GET cmdapp_info_list 0 appname)
       list(GET cmdapp_info_list 1 raw_dependencies)
       string(REPLACE "_" "\\;" dependencies "${raw_dependencies}")
       set(dependencies_list ${dependencies})
 
       mitkFunctionCreateCommandLineApp(
         NAME ${appname}
         DEPENDS MitkCore MitkDiffusionCore ${dependencies_list}
         PACKAGE_DEPENDS ITK
       )
     endforeach()
 
   if(EXECUTABLE_IS_ENABLED)
     MITK_INSTALL_TARGETS(EXECUTABLES ${EXECUTABLE_TARGET})
   endif()
 
   endif()
diff --git a/Modules/DiffusionImaging/FiberTracking/cmdapps/FiberProcessing/FiberJoin.cpp b/Modules/DiffusionImaging/FiberTracking/cmdapps/FiberProcessing/FiberJoin.cpp
index 8240fe7cff..b4d7ebdd9b 100755
--- a/Modules/DiffusionImaging/FiberTracking/cmdapps/FiberProcessing/FiberJoin.cpp
+++ b/Modules/DiffusionImaging/FiberTracking/cmdapps/FiberProcessing/FiberJoin.cpp
@@ -1,92 +1,99 @@
 /*===================================================================
 
 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 "MiniAppManager.h"
-#include <mitkBaseDataIOFactory.h>
+#include <mitkIOUtil.h>
 #include <metaCommand.h>
-#include "ctkCommandLineParser.h"
+#include "mitkCommandLineParser.h"
 #include <usAny.h>
 #include <mitkIOUtil.h>
 #include <boost/lexical_cast.hpp>
 #include <mitkCoreObjectFactory.h>
 #include <mitkPlanarFigure.h>
 #include <mitkPlanarFigureComposite.h>
 #include <mitkFiberBundle.h>
 
 #define _USE_MATH_DEFINES
 #include <math.h>
 
+mitk::FiberBundle::Pointer LoadFib(std::string filename)
+{
+    std::vector<mitk::BaseData::Pointer> fibInfile = mitk::IOUtil::Load(filename);
+    if( fibInfile.empty() )
+        std::cout << "File " << filename << " could not be read!";
+    mitk::BaseData::Pointer baseData = fibInfile.at(0);
+    return dynamic_cast<mitk::FiberBundle*>(baseData.GetPointer());
+}
+
 /*!
 \brief Join multiple tractograms
 */
-int FiberJoin(int argc, char* argv[])
-  {
-    mitkCommandLineParser parser;
+int main(int argc, char* argv[])
+{
+  mitkCommandLineParser parser;
 
-    parser.setTitle("Fiber Join");
-    parser.setCategory("Fiber Tracking and Processing Methods");
-    parser.setContributor("MIC");
-    parser.setDescription("Join multiple tractograms");
+  parser.setTitle("Fiber Join");
+  parser.setCategory("Fiber Tracking and Processing Methods");
+  parser.setContributor("MIC");
+  parser.setDescription("Join multiple tractograms");
 
-    parser.setArgumentPrefix("--", "-");
-    parser.addArgument("input", "i", mitkCommandLineParser::StringList, "Input:", "input tractograms (.fib, vtk file format)", us::Any(), false);
-    parser.addArgument("out", "o", mitkCommandLineParser::String, "Output:", "output tractogram", us::Any(), false);
+  parser.setArgumentPrefix("--", "-");
+  parser.addArgument("input", "i", mitkCommandLineParser::StringList, "Input:", "input tractograms", us::Any(), false);
+  parser.addArgument("out", "o", mitkCommandLineParser::String, "Output:", "output tractogram", us::Any(), false);
 
-    map<string, us::Any> parsedArgs = parser.parseArguments(argc, argv);
-    if (parsedArgs.size()==0)
-        return EXIT_FAILURE;
+  std::map<std::string, us::Any> parsedArgs = parser.parseArguments(argc, argv);
+  if (parsedArgs.size()==0)
+      return EXIT_FAILURE;
 
-    mitkCommandLineParser::StringContainerType inFibs = us::any_cast<mitkCommandLineParser::StringContainerType>(parsedArgs["input"]);
-    string outFib = us::any_cast<string>(parsedArgs["out"]);
+  mitkCommandLineParser::StringContainerType inFibs = us::any_cast<mitkCommandLineParser::StringContainerType>(parsedArgs["input"]);
+  std::string outFib = us::any_cast<std::string>(parsedArgs["out"]);
 
-    if (inFibs.size()<=1)
-    {
-        std::cout << "More than one input tractogram required!";
-        return EXIT_FAILURE;
-    }
+  if (inFibs.size()<=1)
+  {
+      std::cout << "More than one input tractogram required!";
+      return EXIT_FAILURE;
+  }
 
-    try
-    {
-        mitk::FiberBundle::Pointer result = dynamic_cast<mitk::FiberBundle*>(mitk::IOUtil::LoadDataNode(inFibs.at(0))->GetData());
-        for (int i=1; i<inFibs.size(); i++)
-        {
-            try
-            {
-                mitk::FiberBundle::Pointer inputTractogram = dynamic_cast<mitk::FiberBundle*>(mitk::IOUtil::LoadDataNode(inFibs.at(i))->GetData());
-                result = result->AddBundle(inputTractogram);
-            }
-            catch(...){ std::cout << "could not load: " << inFibs.at(i); }
-        }
-        mitk::IOUtil::SaveBaseData(result, outFib);
-    }
-    catch (itk::ExceptionObject e)
-    {
-        std::cout << e;
-        return EXIT_FAILURE;
-    }
-    catch (std::exception e)
-    {
-        std::cout << e.what();
-        return EXIT_FAILURE;
-    }
-    catch (...)
-    {
-        std::cout << "ERROR!?!";
-        return EXIT_FAILURE;
-    }
-    return EXIT_SUCCESS;
+  try
+  {
+      mitk::FiberBundle::Pointer result = LoadFib(inFibs.at(0));
+      for (int i=1; i<inFibs.size(); i++)
+      {
+          try
+          {
+              mitk::FiberBundle::Pointer inputTractogram = LoadFib(inFibs.at(i));
+              result = result->AddBundle(inputTractogram);
+          }
+          catch(...){ std::cout << "could not load: " << inFibs.at(i); }
+      }
+      mitk::IOUtil::SaveBaseData(result, outFib);
+  }
+  catch (itk::ExceptionObject e)
+  {
+      std::cout << e;
+      return EXIT_FAILURE;
+  }
+  catch (std::exception e)
+  {
+      std::cout << e.what();
+      return EXIT_FAILURE;
+  }
+  catch (...)
+  {
+      std::cout << "ERROR!?!";
+      return EXIT_FAILURE;
+  }
+  return EXIT_SUCCESS;
 }
-RegisterDiffusionMiniApp(FiberJoin);
diff --git a/Modules/DiffusionImaging/FiberTracking/cmdapps/Fiberfox/CMakeLists.txt b/Modules/DiffusionImaging/FiberTracking/cmdapps/Fiberfox/CMakeLists.txt
index e5aa410786..898ff08c76 100755
--- a/Modules/DiffusionImaging/FiberTracking/cmdapps/Fiberfox/CMakeLists.txt
+++ b/Modules/DiffusionImaging/FiberTracking/cmdapps/Fiberfox/CMakeLists.txt
@@ -1,38 +1,38 @@
 option(BUILD_DiffusionFiberfoxCmdApps "Build commandline tools for diffusion data simulation (Fiberfox)" OFF)
 
 if(BUILD_DiffusionFiberfoxCmdApps OR MITK_BUILD_ALL_APPS)
 
   # needed include directories
   include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     )
 
     # list of diffusion cmdapps
     # if an app requires additional dependencies
     # they are added after a "^^" and separated by "_"
     set( diffusionFiberfoxcmdapps
     Fiberfox^^MitkFiberTracking
     )
 
-    foreach(diffusionFiberfoxcmdapp ${diffusiontractographycmdapps})
+    foreach(diffusionFiberfoxcmdapp ${diffusionFiberfoxcmdapps})
       # extract cmd app name and dependencies
       string(REPLACE "^^" "\\;" cmdapp_info ${diffusionFiberfoxcmdapp})
       set(cmdapp_info_list ${cmdapp_info})
       list(GET cmdapp_info_list 0 appname)
       list(GET cmdapp_info_list 1 raw_dependencies)
       string(REPLACE "_" "\\;" dependencies "${raw_dependencies}")
       set(dependencies_list ${dependencies})
 
       mitkFunctionCreateCommandLineApp(
         NAME ${appname}
         DEPENDS MitkCore MitkDiffusionCore ${dependencies_list}
         PACKAGE_DEPENDS ITK
       )
     endforeach()
 
   if(EXECUTABLE_IS_ENABLED)
     MITK_INSTALL_TARGETS(EXECUTABLES ${EXECUTABLE_TARGET})
   endif()
 
   endif()
diff --git a/Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/CMakeLists.txt b/Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/CMakeLists.txt
index 9692f7b2ae..087a310ec5 100755
--- a/Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/CMakeLists.txt
+++ b/Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/CMakeLists.txt
@@ -1,40 +1,40 @@
 option(BUILD_DiffusionTractographyEvaluationCmdApps "Build commandline tools for diffusion fiber tractography evaluation" OFF)
 
 if(BUILD_DiffusionTractographyEvaluationCmdApps OR MITK_BUILD_ALL_APPS)
 
   # needed include directories
   include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     )
 
     # list of diffusion cmdapps
     # if an app requires additional dependencies
     # they are added after a "^^" and separated by "_"
     set( diffusionTractographyEvaluationcmdapps
     PeaksAngularError^^MitkFiberTracking
     TractometerMetrics^^MitkFiberTracking
     # LocalDirectionalFiberPlausibility^^MitkFiberTracking # HAS TO USE NEW PEAK IMAGE FORMAT
     )
 
-    foreach(diffusionTractographyEvaluationcmdapp ${diffusiontractographycmdapps})
+    foreach(diffusionTractographyEvaluationcmdapp ${diffusionTractographyEvaluationcmdapps})
       # extract cmd app name and dependencies
       string(REPLACE "^^" "\\;" cmdapp_info ${diffusionTractographyEvaluationcmdapp})
       set(cmdapp_info_list ${cmdapp_info})
       list(GET cmdapp_info_list 0 appname)
       list(GET cmdapp_info_list 1 raw_dependencies)
       string(REPLACE "_" "\\;" dependencies "${raw_dependencies}")
       set(dependencies_list ${dependencies})
 
       mitkFunctionCreateCommandLineApp(
         NAME ${appname}
         DEPENDS MitkCore MitkDiffusionCore ${dependencies_list}
         PACKAGE_DEPENDS ITK
       )
     endforeach()
 
   if(EXECUTABLE_IS_ENABLED)
     MITK_INSTALL_TARGETS(EXECUTABLES ${EXECUTABLE_TARGET})
   endif()
 
   endif()