diff --git a/Fit/Kernel/FitKernel.cpp b/Fit/Kernel/FitKernel.cpp
index 825023d3d9b41d71b13c55ce35aaca71da7ececf..d47641532c4033dd0c1d5408810add38a7a9ffbc 100644
--- a/Fit/Kernel/FitKernel.cpp
+++ b/Fit/Kernel/FitKernel.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Kernel/FitKernel.h b/Fit/Kernel/FitKernel.h
index 2852d6b7114aa704caa7d844537b97f5aefc2b58..fb7090e47dd8c7188b178c4682f6420d4a19d4c5 100644
--- a/Fit/Kernel/FitKernel.h
+++ b/Fit/Kernel/FitKernel.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Kernel/FitKernelImpl.cpp b/Fit/Kernel/FitKernelImpl.cpp
index 512b83d50c4bd2316bf69855e0ae7fd39dd620de..8268c5f98154f09f057e4beaa287f4f7f0f3a85d 100644
--- a/Fit/Kernel/FitKernelImpl.cpp
+++ b/Fit/Kernel/FitKernelImpl.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Kernel/FitKernelImpl.h b/Fit/Kernel/FitKernelImpl.h
index 673ce20781d23b271c1464ad285249b6dc7379af..88392f918429ed3ac47fb0413cc7f2291a212bfa 100644
--- a/Fit/Kernel/FitKernelImpl.h
+++ b/Fit/Kernel/FitKernelImpl.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Kernel/MinimizerCatalogue.cpp b/Fit/Kernel/MinimizerCatalogue.cpp
index c594acbc0ecca8e98a89ecd24ceddd9e07311b69..18ff19c5b52b0e09db1ae6fbcd23a4e6d23c34b0 100644
--- a/Fit/Kernel/MinimizerCatalogue.cpp
+++ b/Fit/Kernel/MinimizerCatalogue.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Kernel/MinimizerCatalogue.h b/Fit/Kernel/MinimizerCatalogue.h
index ec1ed9df733db29501deb4b2f9493fceacb49483..a223c01c4839d527e6e2ed7a13a6ef23113c675e 100644
--- a/Fit/Kernel/MinimizerCatalogue.h
+++ b/Fit/Kernel/MinimizerCatalogue.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Kernel/MinimizerFactory.cpp b/Fit/Kernel/MinimizerFactory.cpp
index 9da3eae591cce7075fc390aba140347a572ccce1..eb07c0d38922f1f5cdb187a28fd0473d9139e587 100644
--- a/Fit/Kernel/MinimizerFactory.cpp
+++ b/Fit/Kernel/MinimizerFactory.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Kernel/MinimizerFactory.h b/Fit/Kernel/MinimizerFactory.h
index 1a51d955cfc39aed610afbc1ad30ecbbb4663849..9286b0676e44f1c6142b26d367a3a3b8e618dbe9 100644
--- a/Fit/Kernel/MinimizerFactory.h
+++ b/Fit/Kernel/MinimizerFactory.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Kernel/ObjectiveFunction.cpp b/Fit/Kernel/ObjectiveFunction.cpp
index d51a809b32f7ab9e154e21c2ebf536e7702fea0b..0b20ff82be34b83b2f7e97cda69663b0688c3938 100644
--- a/Fit/Kernel/ObjectiveFunction.cpp
+++ b/Fit/Kernel/ObjectiveFunction.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Kernel/ObjectiveFunction.h b/Fit/Kernel/ObjectiveFunction.h
index 653344ae1d2b84685550de87ea0f18e0e6508162..6bb24ed21066433d42afc30878f2c11759447839 100644
--- a/Fit/Kernel/ObjectiveFunction.h
+++ b/Fit/Kernel/ObjectiveFunction.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Minimizer/IMinimizer.cpp b/Fit/Minimizer/IMinimizer.cpp
index 0e0a9e4b1cf9fb6d8916c6925592edab70800a90..ddbcaef19983a545970a0c408c022af161ac679c 100644
--- a/Fit/Minimizer/IMinimizer.cpp
+++ b/Fit/Minimizer/IMinimizer.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Minimizer/IMinimizer.h b/Fit/Minimizer/IMinimizer.h
index f4dbfd9b2e861e55e3794b976c9d3e6d601db537..7c64e8fdece1e36a31110bcf06f8b5ac53e55a98 100644
--- a/Fit/Minimizer/IMinimizer.h
+++ b/Fit/Minimizer/IMinimizer.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Minimizer/KernelTypes.h b/Fit/Minimizer/KernelTypes.h
index 1e50a50fb06197bf1889592a9935c083c580e57d..6fbc82fa0d39957c19dd1eb6a09dc35160863c2b 100644
--- a/Fit/Minimizer/KernelTypes.h
+++ b/Fit/Minimizer/KernelTypes.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Minimizer/MinimizerConstants.h b/Fit/Minimizer/MinimizerConstants.h
index aa93bc1f0fec2fa39cddea4105a7b5f4bfea97e1..4929c5c5d87c6402cfff744f77778fc7d91db64c 100644
--- a/Fit/Minimizer/MinimizerConstants.h
+++ b/Fit/Minimizer/MinimizerConstants.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Minimizer/MinimizerInfo.cpp b/Fit/Minimizer/MinimizerInfo.cpp
index df6c44f69f78f6f1c33daccbeecd750ea89964dc..aaa6d82130befa5a5e0c3475de6b6c90fb893230 100644
--- a/Fit/Minimizer/MinimizerInfo.cpp
+++ b/Fit/Minimizer/MinimizerInfo.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Minimizer/MinimizerInfo.h b/Fit/Minimizer/MinimizerInfo.h
index 1fb4f0a40f1eef8d6b0ed653d2b08ecc87594bcd..14a0b92030609ee1cce9a11d487270e25ed25a30 100644
--- a/Fit/Minimizer/MinimizerInfo.h
+++ b/Fit/Minimizer/MinimizerInfo.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Minimizer/TestMinimizer.cpp b/Fit/Minimizer/TestMinimizer.cpp
index f640d344b1a2a493a2cb502f5fd51f5826ae9cca..c09b66e1711279e93cd34c439da706cac99ddd7f 100644
--- a/Fit/Minimizer/TestMinimizer.cpp
+++ b/Fit/Minimizer/TestMinimizer.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Minimizer/TestMinimizer.h b/Fit/Minimizer/TestMinimizer.h
index b8ef2fe1efd4ad9311960f5fd712c297df94a161..0aef8491dac695be6141777698a3086defcb7c7e 100644
--- a/Fit/Minimizer/TestMinimizer.h
+++ b/Fit/Minimizer/TestMinimizer.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Options/FitOptions.h b/Fit/Options/FitOptions.h
index 35d1c4664eef6bb8e3bebff0d5966062d9fedd33..733f9cd76cdbdd19daf28282527b464a117d5961 100644
--- a/Fit/Options/FitOptions.h
+++ b/Fit/Options/FitOptions.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Options/MinimizerOptions.cpp b/Fit/Options/MinimizerOptions.cpp
index e59654daadaabb555c2643d59667694eed0fd35c..72643dd9858e0a341835a35befe61b13f38cba9f 100644
--- a/Fit/Options/MinimizerOptions.cpp
+++ b/Fit/Options/MinimizerOptions.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Options/MinimizerOptions.h b/Fit/Options/MinimizerOptions.h
index e2c05b14695a614947eaf1128e385fbc778a2d3d..98f519d1519b66fd207bef9eaf3d0d89d31bdee5 100644
--- a/Fit/Options/MinimizerOptions.h
+++ b/Fit/Options/MinimizerOptions.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Options/MultiOption.cpp b/Fit/Options/MultiOption.cpp
index e36211f861b46d78d6b16905d6687a43063ce46e..ceb1abde95bfc9d1da809f4fe41ae509688ef666 100644
--- a/Fit/Options/MultiOption.cpp
+++ b/Fit/Options/MultiOption.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Options/MultiOption.h b/Fit/Options/MultiOption.h
index 7c5c4fed78339fe0da871665693b14cdd4275bdd..41f7217e569b7ff40bf946e8d3a370f73c340e0b 100644
--- a/Fit/Options/MultiOption.h
+++ b/Fit/Options/MultiOption.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Options/OptionContainer.cpp b/Fit/Options/OptionContainer.cpp
index d4ea40b7d696d5792558a7048af991bb79642498..f5b0a39cd8fe9d28f0e9ab95743b4260f452a188 100644
--- a/Fit/Options/OptionContainer.cpp
+++ b/Fit/Options/OptionContainer.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Options/OptionContainer.h b/Fit/Options/OptionContainer.h
index fc5a71bf9fd23ae85aaee196adb9352ad42826f5..10689386dff5f0eff421897d8befb724be409853 100644
--- a/Fit/Options/OptionContainer.h
+++ b/Fit/Options/OptionContainer.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Parameters/AttLimits.cpp b/Fit/Parameters/AttLimits.cpp
index 5c659a0df51bf12042c04d407f649d3d7a48ae41..01f4595553527fe0c0bbf74ec3db7c29cc23104e 100644
--- a/Fit/Parameters/AttLimits.cpp
+++ b/Fit/Parameters/AttLimits.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Parameters/AttLimits.h b/Fit/Parameters/AttLimits.h
index eaea3df386e9485ab36ad9a48bf1e72be6924cb1..47170a296f44738448a153e5de75e55b90ecf105 100644
--- a/Fit/Parameters/AttLimits.h
+++ b/Fit/Parameters/AttLimits.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Parameters/Attributes.h b/Fit/Parameters/Attributes.h
index 63ed29bc79ce542b541589baf6932fc06d0a79ed..8ff768508500796a979174fdeb884b6071601686 100644
--- a/Fit/Parameters/Attributes.h
+++ b/Fit/Parameters/Attributes.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Parameters/FitParameterSet.cpp b/Fit/Parameters/FitParameterSet.cpp
index 21f9cef90fabd24fdd6536d6bff446c10b934544..46d2b2226eacad3ee8a1152ae5f966e4b0f373a0 100644
--- a/Fit/Parameters/FitParameterSet.cpp
+++ b/Fit/Parameters/FitParameterSet.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Parameters/FitParameterSet.h b/Fit/Parameters/FitParameterSet.h
index 3dedcb301161ebf1cc6b640518ad22579f2ebec2..f42003dc7bedb9babc3e0c693d4f0f872771c89d 100644
--- a/Fit/Parameters/FitParameterSet.h
+++ b/Fit/Parameters/FitParameterSet.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Parameters/IFitParameter.cpp b/Fit/Parameters/IFitParameter.cpp
index ffe614c586e474d32dbec37b12f7ebcf0c090bcb..9a7d34c40460896bd3f6d2ffc2520f2558d4913e 100644
--- a/Fit/Parameters/IFitParameter.cpp
+++ b/Fit/Parameters/IFitParameter.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Parameters/IFitParameter.h b/Fit/Parameters/IFitParameter.h
index c3aad744d80d0cba6ea59004af292fcffb1f58ef..20f9bff13f533e89c8b3e100c2baeaa25bd12767 100644
--- a/Fit/Parameters/IFitParameter.h
+++ b/Fit/Parameters/IFitParameter.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
@@ -67,7 +66,7 @@ public:
 protected:
     IFitParameter(const IFitParameter& other);
 
-private:    
+private:
     std::string m_name;
     double m_start_value;
     double m_value;
diff --git a/Fit/Parameters/RealLimits.cpp b/Fit/Parameters/RealLimits.cpp
index 111abf7a5f73a1172af2a0a2bfb3addbaf29e8a9..35bdb85d83752775dd37032a891fee96b2963305 100644
--- a/Fit/Parameters/RealLimits.cpp
+++ b/Fit/Parameters/RealLimits.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Parameters/RealLimits.h b/Fit/Parameters/RealLimits.h
index c497fc80a9eb26776ae5b4a659bdacd9a2cbc8da..e000d11d911360a81c7cc1a9cf5fe8e454e2ba10 100644
--- a/Fit/Parameters/RealLimits.h
+++ b/Fit/Parameters/RealLimits.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.cpp b/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.cpp
index a8484a056b668cc4a85a09859bf0c6dd19587c35..53bfb2f14fdd8b082113f9d1f22ef2a034f9f280 100644
--- a/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.cpp
+++ b/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h b/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h
index 16706716f73e1f32cf06e9cca30a69f93d374cef..ade663e48f5838bc67f57fa947d42e4ea124eafb 100644
--- a/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h
+++ b/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/RootAdapter/GSLMultiMinimizer.cpp b/Fit/RootAdapter/GSLMultiMinimizer.cpp
index cab937aaf205ade4ff2cfd1d2e984ec0c9c5d6f9..d2da05b425ee08cf73b1d69177dfe86f013a01b8 100644
--- a/Fit/RootAdapter/GSLMultiMinimizer.cpp
+++ b/Fit/RootAdapter/GSLMultiMinimizer.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/RootAdapter/GSLMultiMinimizer.h b/Fit/RootAdapter/GSLMultiMinimizer.h
index fa48abbf2ad4a6b0fbf26b3fe07b29356293831b..d6d23a7915a4c01c7ea9a42ed9d8f2b32b7330de 100644
--- a/Fit/RootAdapter/GSLMultiMinimizer.h
+++ b/Fit/RootAdapter/GSLMultiMinimizer.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/RootAdapter/GeneticMinimizer.cpp b/Fit/RootAdapter/GeneticMinimizer.cpp
index dd6ce9b09690ca09ca3aeacfeb2396b7b3a2536d..c45add048ec794ec8837890c08bc9f0461fd9420 100644
--- a/Fit/RootAdapter/GeneticMinimizer.cpp
+++ b/Fit/RootAdapter/GeneticMinimizer.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/RootAdapter/GeneticMinimizer.h b/Fit/RootAdapter/GeneticMinimizer.h
index 36752e919fd7f2b34f5c101ec5468734f3aa5a0b..2d5eedbd9c22e36b6fb9d3cc342f027b8ded5329 100644
--- a/Fit/RootAdapter/GeneticMinimizer.h
+++ b/Fit/RootAdapter/GeneticMinimizer.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/RootAdapter/MinimizerResultsHelper.cpp b/Fit/RootAdapter/MinimizerResultsHelper.cpp
index d3889548a9477da8271b8d81beffc8d38cf675c4..ccbf48e30ec0568004b994ab0d6dee4d846948e0 100644
--- a/Fit/RootAdapter/MinimizerResultsHelper.cpp
+++ b/Fit/RootAdapter/MinimizerResultsHelper.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/RootAdapter/MinimizerResultsHelper.h b/Fit/RootAdapter/MinimizerResultsHelper.h
index ed8e4a6854152f2d60cad5dcd5a0dc0c98f9a068..f20066529277e9a3c940063975defab3a4c6dfe4 100644
--- a/Fit/RootAdapter/MinimizerResultsHelper.h
+++ b/Fit/RootAdapter/MinimizerResultsHelper.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/RootAdapter/Minuit2Minimizer.cpp b/Fit/RootAdapter/Minuit2Minimizer.cpp
index 06f6bb2699ef866bc180306e14f0ac082d5f1c70..e5a6a2ab4d2d77b1c848135b11d82238ac165c5c 100644
--- a/Fit/RootAdapter/Minuit2Minimizer.cpp
+++ b/Fit/RootAdapter/Minuit2Minimizer.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/RootAdapter/Minuit2Minimizer.h b/Fit/RootAdapter/Minuit2Minimizer.h
index 5706fd716f978383065a7ef860e5c3c43cd4ed20..9500c25198ea3d526c7b15cd27167a5b5fce6bb4 100644
--- a/Fit/RootAdapter/Minuit2Minimizer.h
+++ b/Fit/RootAdapter/Minuit2Minimizer.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/RootAdapter/RootMinimizerAdapter.cpp b/Fit/RootAdapter/RootMinimizerAdapter.cpp
index 734c5044ba81c668d407776196523ff06d8aa036..4312ee7c67334bfb6e260470a7ea760267e5cff3 100644
--- a/Fit/RootAdapter/RootMinimizerAdapter.cpp
+++ b/Fit/RootAdapter/RootMinimizerAdapter.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/RootAdapter/RootMinimizerAdapter.h b/Fit/RootAdapter/RootMinimizerAdapter.h
index e01a7be135fa37bc3bf8d617dd4ce8c30e1a244f..2e6295b97c74299fde0d23b31396934297e8e6f7 100644
--- a/Fit/RootAdapter/RootMinimizerAdapter.h
+++ b/Fit/RootAdapter/RootMinimizerAdapter.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/RootAdapter/RootMinimizerFunctions.h b/Fit/RootAdapter/RootMinimizerFunctions.h
index c1e3f78c7b7ff4b18528b1970d074e509efd83be..85d08804939f57a74f74e5bc3612902ecd131673 100644
--- a/Fit/RootAdapter/RootMinimizerFunctions.h
+++ b/Fit/RootAdapter/RootMinimizerFunctions.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/RootAdapter/RootObjectiveFuncAdapter.cpp b/Fit/RootAdapter/RootObjectiveFuncAdapter.cpp
index 30ae3f2db4cb2ff4c99cebd3203319ea18df43f6..faf5965a73c5e71c4865d4a39646fa63e4bde1b3 100644
--- a/Fit/RootAdapter/RootObjectiveFuncAdapter.cpp
+++ b/Fit/RootAdapter/RootObjectiveFuncAdapter.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/RootAdapter/RootObjectiveFuncAdapter.h b/Fit/RootAdapter/RootObjectiveFuncAdapter.h
index a73e50a89c6c1a8df653e1e94ba8dfa5a4201b95..b7b1d4dad6abb6736330bc4f88a5388b9a9e328a 100644
--- a/Fit/RootAdapter/RootObjectiveFuncAdapter.h
+++ b/Fit/RootAdapter/RootObjectiveFuncAdapter.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/RootAdapter/SimAnMinimizer.cpp b/Fit/RootAdapter/SimAnMinimizer.cpp
index 9e6b38f00bdeb4f6d58ef79bbb7eb84ffa3020c2..3357faf2847d104eb346b18f70d6de893c7cc94c 100644
--- a/Fit/RootAdapter/SimAnMinimizer.cpp
+++ b/Fit/RootAdapter/SimAnMinimizer.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/RootAdapter/SimAnMinimizer.h b/Fit/RootAdapter/SimAnMinimizer.h
index fd7b91f8005b95729c9fd92a05470cc825f16873..6f694be22a430c8d64fe1e7f8b8c2bf050d2469e 100644
--- a/Fit/RootAdapter/SimAnMinimizer.h
+++ b/Fit/RootAdapter/SimAnMinimizer.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Utils/MinimizerUtils.cpp b/Fit/Utils/MinimizerUtils.cpp
index 1d1ce8ad92f001a95bac6a007fb72ef44cc7eb26..49e69cf907dcf14720bf1d9d6c445ff3b27804db 100644
--- a/Fit/Utils/MinimizerUtils.cpp
+++ b/Fit/Utils/MinimizerUtils.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Utils/MinimizerUtils.h b/Fit/Utils/MinimizerUtils.h
index 82fa57d03e3818f9e162d7f95c56ea361722299d..c4cf2ec4eb573703778aa3dd75ebf55811a72607 100644
--- a/Fit/Utils/MinimizerUtils.h
+++ b/Fit/Utils/MinimizerUtils.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Utils/StringUtils.cpp b/Fit/Utils/StringUtils.cpp
index 38d0e1bd61a7007c2fb1372b164cdd2ce5013703..0f5d7a232536648645dd75f8edc8d2e2e85e33d9 100644
--- a/Fit/Utils/StringUtils.cpp
+++ b/Fit/Utils/StringUtils.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Utils/StringUtils.h b/Fit/Utils/StringUtils.h
index 311021366a71dc0c12ae98176440ef99d9d36cc6..85d1ad5e891459c51cca106c01b3a3436a58e1ee 100644
--- a/Fit/Utils/StringUtils.h
+++ b/Fit/Utils/StringUtils.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Utils/TimeInterval.cpp b/Fit/Utils/TimeInterval.cpp
index ee9aadc5d4fca89dbc8ea575a03fac7bb359edb7..41b583ad075427e14726e08a5476753a0ba6febd 100644
--- a/Fit/Utils/TimeInterval.cpp
+++ b/Fit/Utils/TimeInterval.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/Fit/Utils/TimeInterval.h b/Fit/Utils/TimeInterval.h
index 5d0406ca6665d56d881c0f5230bc4911f423fb3a..3c68dfd7bb44c7f6c201064ffa4d662b65054d1d 100644
--- a/Fit/Utils/TimeInterval.h
+++ b/Fit/Utils/TimeInterval.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/dev-tools/edit/update-sourcecode-header.py b/dev-tools/edit/update-sourcecode-header.py
index 6e17ef4355b948e8232c0ef9f562c64252b47e96..c5580d557c52e904e91bdb8634b638a6b1e9cf0f 100644
--- a/dev-tools/edit/update-sourcecode-header.py
+++ b/dev-tools/edit/update-sourcecode-header.py
@@ -13,10 +13,10 @@ directories = [
     # "Core/Samples",
     # "Core/StandardSamples",
     # "Core/Tools",
-    # "Fit/FitKernel",
+    "Fit",
     # "GUI/coregui",
     # "GUI/main",
-    "GUI/ba3d",
+    # "GUI/ba3d",
 ]
 
 #