diff --git a/App/App.pro b/App/App.pro
index 9c654cb1517eb34525468352694595b5b8774986..e35e6e812297b377f141f993aee425b7a4310427 100644
--- a/App/App.pro
+++ b/App/App.pro
@@ -147,7 +147,6 @@ HEADERS += \
     inc/TestSpecularMatrix.h \
     inc/TestToySimulation.h \
     inc/TreeEventStructure.h \
-    inc/Version.h \
     inc/TestBugs.h
 
 myIncludes = $$PWD/inc \
diff --git a/App/src/main.cpp b/App/src/main.cpp
index 185ff88ff198c91b87dc78b89b80502fbc434436..6a6815ea85207827773b67ae13ee875683150488 100644
--- a/App/src/main.cpp
+++ b/App/src/main.cpp
@@ -34,7 +34,7 @@ int main(int argc, char **argv)
     Utils::EnableFloatingPointExceptions();
 
     std::cout << AppVersion::g_app_name << " "
-              << AppVersion::g_app_version_number << std::endl;
+              << AppVersion::GetVersionNumber() << std::endl;
 
     FunctionalTestFactory test_factory;
     RegisterFunctionalTests(&test_factory);
diff --git a/Core/Core.pro b/Core/Core.pro
index 8b03c8cb797705e0b1ea59147ba53406b32fa6f0..9a4a87c85be53c8c91eb6b69032d554bbad189c9 100644
--- a/Core/Core.pro
+++ b/Core/Core.pro
@@ -302,7 +302,8 @@ HEADERS += \
     StandardSamples/IsGISAXS06Builder.h \
     StandardSamples/IsGISAXS09Builder.h \
     Algorithms/inc/LayerStrategyBuilder.h \
-    Algorithms/inc/DecoratedLayerDWBASimulation.h
+    Algorithms/inc/DecoratedLayerDWBASimulation.h \
+    Samples/inc/Version.h
 
 contains(CONFIG, BORNAGAIN_PYTHON) {
    include($$PWD/python_module.pri)
diff --git a/Core/PythonAPI/inc/PythonCoreList.h b/Core/PythonAPI/inc/PythonCoreList.h
index 73aa060f44de066e7fdfb374b230024ece11900d..d4954d3339ccd409eed775f245610907a86c4fe4 100644
--- a/Core/PythonAPI/inc/PythonCoreList.h
+++ b/Core/PythonAPI/inc/PythonCoreList.h
@@ -79,6 +79,7 @@
 #include "StochasticSampledParameter.h"
 #include "Types.h"
 #include "Units.h"
+#include "Version.h"
 
 //! file containig additional exposers
 #include "PythonCoreExposer.h"
diff --git a/App/inc/Version.h b/Core/Samples/inc/Version.h
similarity index 59%
rename from App/inc/Version.h
rename to Core/Samples/inc/Version.h
index 0f580d264a3060e6345697fb96159cf539d4d3f3..4554463d4795669811345c00bf91359d2c4997a3 100644
--- a/App/inc/Version.h
+++ b/Core/Samples/inc/Version.h
@@ -1,5 +1,5 @@
 // ************************************************************************** //
-//                                                                         
+//
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
 //! @file      App/inc/Version.h
@@ -16,11 +16,30 @@
 #ifndef VERSION_H_
 #define VERSION_H_
 
+#include <string>
+#include <sstream>
+
 namespace AppVersion {
-    const std::string g_app_name = "Born Again Functional tests";
-    const std::string g_app_version_number = "v0.8.1";
+    const std::string g_app_name = "Born Again";
+    const int major_version_number = 0;
+    const int minor_version_number = 8;
+    const int patch_version_number = 2;
+
+    std::string GetVersionNumber()
+    {
+        std::ostringstream ostr;
+        ostr << major_version_number
+             << "."
+             << minor_version_number
+             << "."
+             << patch_version_number ;
+
+        return ostr.str();
+    }
+
 }
 
-#endif /* VERSION_H_ */
 
 
+#endif /* VERSION_H_ */
+
diff --git a/dev-tools/python-bindings/MakePyCore.py b/dev-tools/python-bindings/MakePyCore.py
index 674544cafbbcd0cea8e0770a8ccdb096a54d048b..5b23a8034946f48c48e4f56668af2236c3ea9a31 100644
--- a/dev-tools/python-bindings/MakePyCore.py
+++ b/dev-tools/python-bindings/MakePyCore.py
@@ -211,7 +211,7 @@ def ManualClassTunings(mb):
     for fun in cl.member_functions():
         if fun.name == "setMaterial":fun.include()
     for fun in cl.member_functions():
-        print "XXX", fun
+        if("void ( ::Layer::* )( ::IDecoration * )" in fun.decl_string): fun.exclude()
     cl.constructors().include() # including back constructors with pointers
     #
     cl = mb.class_("Simulation")