diff --git a/Core/PythonAPI/src/PythonModule.cpp b/Core/PythonAPI/src/PythonModule.cpp
index fa1e1a23c27ff86486ee3d9e5241f16dd5ab91bd..ae3513917f92d94242653b498f235807fb0c8286 100644
--- a/Core/PythonAPI/src/PythonModule.cpp
+++ b/Core/PythonAPI/src/PythonModule.cpp
@@ -4,110 +4,110 @@
 #include "numpy/arrayobject.h"
 // the order of 3 guys above is important
 
-#include "ParticleBuilder.pypp.h" 
-#include "FormFactorFullSpheroid.pypp.h" 
-#include "DistributionGate.pypp.h" 
-#include "SimpleSelectionRule.pypp.h" 
-#include "RealParameterWrapper.pypp.h" 
-#include "vdouble1d_t.pypp.h" 
-#include "SimulationParameters.pypp.h" 
-#include "Transform3D.pypp.h" 
-#include "ThreadInfo.pypp.h" 
-#include "InterferenceFunction2DLattice.pypp.h" 
-#include "LayerInterface.pypp.h" 
-#include "FormFactorCone6.pypp.h" 
-#include "FormFactorTetrahedron.pypp.h" 
+#include "IFTDistribution2D.pypp.h" 
+#include "IntensityDataHelper.pypp.h" 
+#include "Detector.pypp.h" 
+#include "FormFactorRipple2.pypp.h" 
 #include "DistributionGaussian.pypp.h" 
-#include "IDetectorResolution.pypp.h" 
+#include "LatticeBasis.pypp.h" 
+#include "ParticleCoreShell.pypp.h" 
+#include "Beam.pypp.h" 
+#include "Lattice.pypp.h" 
 #include "FormFactorCylinder.pypp.h" 
-#include "Crystal.pypp.h" 
-#include "IFormFactorBorn.pypp.h" 
-#include "FormFactorEllipsoidalCylinder.pypp.h" 
-#include "InterferenceFunctionNone.pypp.h" 
-#include "vector_kvector_t.pypp.h" 
-#include "Particle.pypp.h" 
-#include "FTDistribution2DCauchy.pypp.h" 
-#include "FormFactorCrystal.pypp.h" 
+#include "ICloneable.pypp.h" 
+#include "StochasticSampledParameter.pypp.h" 
+#include "HomogeneousMaterial.pypp.h" 
+#include "FormFactorCone6.pypp.h" 
+#include "vector_integer_t.pypp.h" 
+#include "AxisDouble.pypp.h" 
+#include "IAxis.pypp.h" 
+#include "FormFactorTetrahedron.pypp.h" 
+#include "Layer.pypp.h" 
+#include "ThreadInfo.pypp.h" 
+#include "IFormFactor.pypp.h" 
+#include "IObservable.pypp.h" 
+#include "FormFactorParallelepiped.pypp.h" 
+#include "RealParameterWrapper.pypp.h" 
 #include "MaterialManager.pypp.h" 
-#include "vector_longinteger_t.pypp.h" 
+#include "ResolutionFunction2DSimple.pypp.h" 
+#include "SimulationParameters.pypp.h" 
+#include "FormFactorSphereUniformRadius.pypp.h" 
+#include "AxisBin.pypp.h" 
+#include "FormFactorGauss.pypp.h" 
+#include "FormFactorFullSpheroid.pypp.h" 
 #include "FormFactorAnisoPyramid.pypp.h" 
+#include "PythonInterface_global_variables.pypp.h" 
+#include "ISampleBuilder.pypp.h" 
+#include "StochasticParameter_t.pypp.h" 
+#include "StochasticDoubleGaussian.pypp.h" 
+#include "FormFactorPrism6.pypp.h" 
+#include "InterferenceFunction2DLattice.pypp.h" 
+#include "FormFactorPyramid.pypp.h" 
+#include "FormFactorBox.pypp.h" 
+#include "FormFactorSpheroid.pypp.h" 
+#include "DistributionCosine.pypp.h" 
+#include "IResolutionFunction2D.pypp.h" 
+#include "IFormFactorBorn.pypp.h" 
 #include "MultiLayer.pypp.h" 
-#include "IFormFactor.pypp.h" 
-#include "kvector_t.pypp.h" 
-#include "FormFactorSphereUniformRadius.pypp.h" 
-#include "OffSpecSimulation.pypp.h" 
-#include "FormFactorRipple1.pypp.h" 
-#include "InterferenceFunction1DParaCrystal.pypp.h" 
-#include "Simulation.pypp.h" 
-#include "IObservable.pypp.h" 
-#include "FormFactorLorentz.pypp.h" 
-#include "FormFactorSphere.pypp.h" 
-#include "ISelectionRule.pypp.h" 
-#include "FormFactorRipple2.pypp.h" 
-#include "StochasticDoubleGate.pypp.h" 
-#include "LayerRoughness.pypp.h" 
-#include "Bin1DCVector.pypp.h" 
-#include "FormFactorSphereGaussianRadius.pypp.h" 
+#include "DistributionLorentz.pypp.h" 
+#include "ParticleDecoration.pypp.h" 
+#include "IDecoration.pypp.h" 
+#include "FTDistribution2DCauchy.pypp.h" 
+#include "ICompositeSample.pypp.h" 
+#include "cvector_t.pypp.h" 
 #include "ParameterPool.pypp.h" 
+#include "Particle.pypp.h" 
+#include "FormFactorCone.pypp.h" 
 #include "FormFactorPrism3.pypp.h" 
-#include "StochasticDoubleGaussian.pypp.h" 
+#include "InterferenceFunction2DParaCrystal.pypp.h" 
+#include "vdouble1d_t.pypp.h" 
+#include "FormFactorEllipsoidalCylinder.pypp.h" 
+#include "MesoCrystal.pypp.h" 
+#include "FormFactorDecoratorDebyeWaller.pypp.h" 
+#include "vector_IFormFactorPtr_t.pypp.h" 
 #include "IMaterial.pypp.h" 
-#include "ResolutionFunction2DSimple.pypp.h" 
-#include "AxisDouble.pypp.h" 
-#include "FormFactorPrism6.pypp.h" 
-#include "IClusteredParticles.pypp.h" 
-#include "ParticleDecoration.pypp.h" 
-#include "FormFactorParallelepiped.pypp.h" 
-#include "DistributionCosine.pypp.h" 
+#include "IFormFactorDecorator.pypp.h" 
+#include "Instrument.pypp.h" 
+#include "IDetectorResolution.pypp.h" 
 #include "FormFactorHemiEllipsoid.pypp.h" 
-#include "IAxis.pypp.h" 
-#include "vector_integer_t.pypp.h" 
-#include "Layer.pypp.h" 
-#include "FormFactorPyramid.pypp.h" 
-#include "StochasticSampledParameter.pypp.h" 
-#include "DistributionLorentz.pypp.h" 
 #include "IDistribution1D.pypp.h" 
+#include "ISelectionRule.pypp.h" 
+#include "Bin1D.pypp.h" 
+#include "ParticleInfo.pypp.h" 
+#include "vector_longinteger_t.pypp.h" 
+#include "DistributionLogNormal.pypp.h" 
+#include "LayerInterface.pypp.h" 
+#include "FormFactorFullSphere.pypp.h" 
+#include "Transform3D.pypp.h" 
+#include "OffSpecSimulation.pypp.h" 
+#include "FormFactorRipple1.pypp.h" 
 #include "PositionParticleInfo.pypp.h" 
-#include "FormFactorCuboctahedron.pypp.h" 
-#include "cvector_t.pypp.h" 
+#include "LayerRoughness.pypp.h" 
+#include "FormFactorCrystal.pypp.h" 
+#include "IntensityData.pypp.h" 
+#include "IParameterized.pypp.h" 
+#include "Bin1DCVector.pypp.h" 
+#include "DistributionGate.pypp.h" 
+#include "StochasticDoubleGate.pypp.h" 
+#include "IClusteredParticles.pypp.h" 
+#include "IInterferenceFunction.pypp.h" 
+#include "SimpleSelectionRule.pypp.h" 
+#include "FormFactorLorentz.pypp.h" 
 #include "OutputDataIOFactory.pypp.h" 
+#include "vector_kvector_t.pypp.h" 
+#include "InterferenceFunction1DParaCrystal.pypp.h" 
+#include "InterferenceFunctionNone.pypp.h" 
+#include "Crystal.pypp.h" 
+#include "FormFactorCuboctahedron.pypp.h" 
 #include "PythonInterface_free_functions.pypp.h" 
-#include "IResolutionFunction2D.pypp.h" 
-#include "vector_IFormFactorPtr_t.pypp.h" 
-#include "FormFactorFullSphere.pypp.h" 
-#include "StochasticParameter_t.pypp.h" 
-#include "FormFactorBox.pypp.h" 
-#include "IParameterized.pypp.h" 
-#include "Lattice2DIFParameters.pypp.h" 
-#include "IFormFactorDecorator.pypp.h" 
+#include "kvector_t.pypp.h" 
+#include "Simulation.pypp.h" 
 #include "ISample.pypp.h" 
-#include "ISampleBuilder.pypp.h" 
-#include "PythonInterface_global_variables.pypp.h" 
-#include "Beam.pypp.h" 
-#include "HomogeneousMaterial.pypp.h" 
-#include "ICloneable.pypp.h" 
-#include "ParticleCoreShell.pypp.h" 
-#include "FormFactorDecoratorDebyeWaller.pypp.h" 
-#include "MesoCrystal.pypp.h" 
 #include "IObserver.pypp.h" 
-#include "IntensityData.pypp.h" 
-#include "Lattice.pypp.h" 
-#include "FormFactorSpheroid.pypp.h" 
-#include "IInterferenceFunction.pypp.h" 
-#include "ParticleInfo.pypp.h" 
-#include "Instrument.pypp.h" 
-#include "IntensityDataHelper.pypp.h" 
-#include "FormFactorCone.pypp.h" 
-#include "IDecoration.pypp.h" 
-#include "FormFactorGauss.pypp.h" 
-#include "InterferenceFunction2DParaCrystal.pypp.h" 
-#include "Detector.pypp.h" 
-#include "LatticeBasis.pypp.h" 
-#include "ICompositeSample.pypp.h" 
-#include "Bin1D.pypp.h" 
-#include "AxisBin.pypp.h" 
-#include "DistributionLogNormal.pypp.h" 
-#include "IFTDistribution2D.pypp.h" 
+#include "ParticleBuilder.pypp.h" 
+#include "FormFactorSphereGaussianRadius.pypp.h" 
+#include "Lattice2DIFParameters.pypp.h" 
+#include "FormFactorSphere.pypp.h" 
 #include "__call_policies.pypp.hpp" 
 #include "__convenience.pypp.hpp" 
 
diff --git a/Doc/Doxygen/Doxyfile b/Doc/Doxygen/Doxyfile
index 74dcd10f14b1f7fe7be10c6fd64cf3091e8d1c65..71e7ac5d78084aaac390def2577a9c1616b6f656 100644
--- a/Doc/Doxygen/Doxyfile
+++ b/Doc/Doxygen/Doxyfile
@@ -821,7 +821,7 @@ EXAMPLE_RECURSIVE      = NO
 # that contain images that are to be included in the documentation (see the
 # \image command).
 
-IMAGE_PATH             = ./Figures
+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
diff --git a/Fit/PythonAPI/src/PythonModule.cpp b/Fit/PythonAPI/src/PythonModule.cpp
index cef704bb3749fa3cea8a8382002eafa0667d35d7..47f021b695791fbf282f56574fd2a61cea9dcbda 100644
--- a/Fit/PythonAPI/src/PythonModule.cpp
+++ b/Fit/PythonAPI/src/PythonModule.cpp
@@ -6,34 +6,35 @@ GCC_DIAG_OFF(missing-field-initializers);
 GCC_DIAG_ON(unused-parameter);
 GCC_DIAG_ON(missing-field-initializers);
 
-#include "MinimizerFactory.pypp.h" 
-#include "IMinimizer.pypp.h" 
-#include "vector_string_t.pypp.h" 
-#include "SquaredFunctionSystematicError.pypp.h" 
-#include "OutputDataNormalizer.pypp.h" 
-#include "INamed.pypp.h" 
+#include "FitStrategyFixParameters.pypp.h" 
 #include "OutputDataSimpleNormalizer.pypp.h" 
-#include "FitSuiteParameters.pypp.h" 
 #include "AttFitting.pypp.h" 
-#include "FitParameter.pypp.h" 
-#include "IChiSquaredModule.pypp.h" 
-#include "FitStrategyAdjustMinimizer.pypp.h" 
+#include "FitSuiteObjects.pypp.h" 
+#include "ISquaredFunction.pypp.h" 
+#include "MinimizerFactory.pypp.h" 
+#include "SquaredFunctionMeanSquaredError.pypp.h" 
+#include "OutputDataNormalizer.pypp.h" 
+#include "vector_string_t.pypp.h" 
+#include "MinimizerOptions.pypp.h" 
 #include "IFitStrategy.pypp.h" 
-#include "FitStrategyFixParameters.pypp.h" 
-#include "SquaredFunctionGaussianError.pypp.h" 
-#include "FitSuite.pypp.h" 
+#include "IOutputDataNormalizer.pypp.h" 
+#include "FitParameter.pypp.h" 
+#include "FitObject.pypp.h" 
+#include "IMinimizer.pypp.h" 
+#include "INamed.pypp.h" 
+#include "FitStrategyReleaseParameters.pypp.h" 
 #include "FitStrategyAdjustParameters.pypp.h" 
-#include "ChiSquaredModule.pypp.h" 
-#include "MinimizerOptions.pypp.h" 
 #include "SquaredFunctionDefault.pypp.h" 
-#include "SquaredFunctionMeanSquaredError.pypp.h" 
-#include "ISquaredFunction.pypp.h" 
+#include "ChiSquaredModule.pypp.h" 
+#include "FitStrategyAdjustMinimizer.pypp.h" 
 #include "FitStrategyDefault.pypp.h" 
+#include "FitSuite.pypp.h" 
 #include "AttLimits.pypp.h" 
-#include "FitObject.pypp.h" 
-#include "FitSuiteObjects.pypp.h" 
-#include "IOutputDataNormalizer.pypp.h" 
-#include "FitStrategyReleaseParameters.pypp.h" 
+#include "IChiSquaredModule.pypp.h" 
+#include "SquaredFunctionSimError.pypp.h" 
+#include "FitSuiteParameters.pypp.h" 
+#include "SquaredFunctionSystematicError.pypp.h" 
+#include "SquaredFunctionGaussianError.pypp.h" 
 
 BOOST_PYTHON_MODULE(libBornAgainFit){
 
@@ -66,5 +67,6 @@ BOOST_PYTHON_MODULE(libBornAgainFit){
     register_SquaredFunctionDefault_class();
     register_SquaredFunctionGaussianError_class();
     register_SquaredFunctionMeanSquaredError_class();
+    register_SquaredFunctionSimError_class();
     register_SquaredFunctionSystematicError_class();
 }