diff --git a/Modules/DiffusionImaging/DiffusionCmdApps/Fiberfox/CMakeLists.txt b/Modules/DiffusionImaging/DiffusionCmdApps/Fiberfox/CMakeLists.txt
index 26dc2d25da..8125ecb6ee 100755
--- a/Modules/DiffusionImaging/DiffusionCmdApps/Fiberfox/CMakeLists.txt
+++ b/Modules/DiffusionImaging/DiffusionCmdApps/Fiberfox/CMakeLists.txt
@@ -1,39 +1,40 @@
 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^^
     FiberfoxOptimization^^
+    RandomFiberPhantom^^
     )
 
     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 MitkDiffusionCmdApps ${dependencies_list}
         PACKAGE_DEPENDS
       )
     endforeach()
 
   if(EXECUTABLE_IS_ENABLED)
     MITK_INSTALL_TARGETS(EXECUTABLES ${EXECUTABLE_TARGET})
   endif()
 
   endif()
diff --git a/Modules/DiffusionImaging/DiffusionCmdApps/Fiberfox/RandomFiberPhantom.cpp b/Modules/DiffusionImaging/DiffusionCmdApps/Fiberfox/RandomFiberPhantom.cpp
new file mode 100755
index 0000000000..1bec6fa582
--- /dev/null
+++ b/Modules/DiffusionImaging/DiffusionCmdApps/Fiberfox/RandomFiberPhantom.cpp
@@ -0,0 +1,162 @@
+/*===================================================================
+
+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 <metaCommand.h>
+#include "mitkCommandLineParser.h"
+#include <usAny.h>
+#include <mitkCoreObjectFactory.h>
+#include <mitkFiberBundle.h>
+#include <mitkDiffusionDataIOHelper.h>
+#include <itkRandomPhantomFilter.h>
+
+/*!
+\brief Join multiple tractograms
+*/
+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.setArgumentPrefix("--", "-");
+  parser.addArgument("num_bundles", "", mitkCommandLineParser::Int, "", "", 50);
+  parser.addArgument("min_density", "", mitkCommandLineParser::Int, "", "", 50);
+  parser.addArgument("max_density", "", mitkCommandLineParser::Int, "", "", 200);
+  parser.addArgument("size_x", "", mitkCommandLineParser::Int, "", "", 250);
+  parser.addArgument("size_y", "", mitkCommandLineParser::Int, "", "", 250);
+  parser.addArgument("size_z", "", mitkCommandLineParser::Int, "", "", 250);
+  parser.addArgument("min_stepsize", "", mitkCommandLineParser::Int, "", "", 15);
+  parser.addArgument("max_stepsize", "", mitkCommandLineParser::Int, "", "", 30);
+  parser.addArgument("min_curve", "", mitkCommandLineParser::Int, "", "", 5);
+  parser.addArgument("max_curve", "", mitkCommandLineParser::Int, "", "", 45);
+  parser.addArgument("min_radius", "", mitkCommandLineParser::Int, "", "", 5);
+  parser.addArgument("max_radius", "", mitkCommandLineParser::Int, "", "", 25);
+  parser.addArgument("min_twist", "", mitkCommandLineParser::Int, "", "", 15);
+  parser.addArgument("max_twist", "", mitkCommandLineParser::Int, "", "", 30);
+  parser.addArgument("", "o", mitkCommandLineParser::String, "Output folder:", "output folder", us::Any(), false);
+
+  std::map<std::string, us::Any> parsedArgs = parser.parseArguments(argc, argv);
+  if (parsedArgs.size()==0)
+    return EXIT_FAILURE;
+
+  std::string out_folder = us::any_cast<std::string>(parsedArgs["o"]);
+
+  int num_bundles=50;
+  if (parsedArgs.count("num_bundles"))
+    num_bundles = us::any_cast<int>(parsedArgs["num_bundles"]);
+
+  int min_density=50;
+  if (parsedArgs.count("min_density"))
+    min_density = us::any_cast<int>(parsedArgs["min_density"]);
+
+  int max_density=200;
+  if (parsedArgs.count("max_density"))
+    max_density = us::any_cast<int>(parsedArgs["max_density"]);
+
+  int size_x=250;
+  if (parsedArgs.count("size_x"))
+    size_x = us::any_cast<int>(parsedArgs["size_x"]);
+
+  int size_y=250;
+  if (parsedArgs.count("size_y"))
+    size_y = us::any_cast<int>(parsedArgs["size_y"]);
+
+  int size_z=250;
+  if (parsedArgs.count("size_z"))
+    size_z = us::any_cast<int>(parsedArgs["size_z"]);
+
+  int min_stepsize=15;
+  if (parsedArgs.count("min_stepsize"))
+    min_stepsize = us::any_cast<int>(parsedArgs["min_stepsize"]);
+
+  int max_stepsize=30;
+  if (parsedArgs.count("max_stepsize"))
+    max_stepsize = us::any_cast<int>(parsedArgs["max_stepsize"]);
+
+  int min_curve=5;
+  if (parsedArgs.count("min_curve"))
+    min_curve = us::any_cast<int>(parsedArgs["min_curve"]);
+
+  int max_curve=45;
+  if (parsedArgs.count("max_curve"))
+    max_curve = us::any_cast<int>(parsedArgs["max_curve"]);
+
+  int min_radius=5;
+  if (parsedArgs.count("min_radius"))
+    min_radius = us::any_cast<int>(parsedArgs["min_radius"]);
+
+  int max_radius=25;
+  if (parsedArgs.count("max_radius"))
+    max_radius = us::any_cast<int>(parsedArgs["max_radius"]);
+
+  int min_twist=15;
+  if (parsedArgs.count("min_twist"))
+    min_twist = us::any_cast<int>(parsedArgs["min_twist"]);
+
+  int max_twist=30;
+  if (parsedArgs.count("max_twist"))
+    max_twist = us::any_cast<int>(parsedArgs["max_twist"]);
+
+  try
+  {
+    itk::RandomPhantomFilter::Pointer filter = itk::RandomPhantomFilter::New();
+    filter->SetNumTracts(num_bundles);
+    filter->setMinStreamlineDensity(min_density);
+    filter->setMaxStreamlineDensity(max_density);
+    mitk::Vector3D vol;
+    vol[0] = size_x;
+    vol[1] = size_y;
+    vol[2] = size_z;
+    filter->setVolumeSize(vol);
+    filter->setStepSizeMin(min_stepsize);
+    filter->setStepSizeMax(max_stepsize);
+    filter->setCurvynessMin(min_curve);
+    filter->setCurvynessMax(max_curve);
+    filter->setStartRadiusMin(min_radius);
+    filter->setStartRadiusMax(max_radius);
+    filter->setMinTwist(min_twist);
+    filter->setMaxTwist(max_twist);
+    filter->Update();
+    auto fibs = filter->GetFiberBundles();
+
+    std::vector< mitk::DataNode::Pointer > fiber_nodes;
+    int c = 1;
+    for (auto fib : fibs)
+    {
+      mitk::IOUtil::Save(fib, out_folder + "Bundle_" + boost::lexical_cast<std::string>(c));
+      ++c;
+    }
+  }
+  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;
+}