diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb1b8f09baae1da2a391486493c76019be951b0f..cf1e1754f5ff254dab4ebbda6dea545a473e86c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ OPTION( SCALFMM_USE_TRACE "Set to ON to print trace or use itac trace" OFF )
 OPTION( SCALFMM_BUILD_TESTS "Set to ON to build fonctionnalities Tests" ON )
 OPTION( SCALFMM_BUILD_UTESTS "Set to ON to build UTests" ON )
 OPTION( SCALFMM_BUILD_DEBUG "Set to ON to build in Debug" OFF )
-OPTION( SCALFMM_USE_MEM_STATS "Set to ON to profile memory" ON )
+OPTION( SCALFMM_USE_MEM_STATS "Set to ON to profile memory" OFF )
 
 
 # MPI option has to be set before project
@@ -28,6 +28,9 @@ project(scalfmm CXX)
 MESSAGE( STATUS "SCALFMM_BUILD_DEBUG = ${SCALFMM_BUILD_DEBUG}" )
 if( SCALFMM_BUILD_DEBUG )
   SET(CMAKE_BUILD_TYPE Debug)
+  ADD_DEFINITIONS(-O0)
+else()
+  ADD_DEFINITIONS(-O2)
 endif()
 
 # Trace
@@ -51,7 +54,7 @@ if( SCALFMM_USE_CBLAS )
 endif()
 
 # Compile option
-ADD_DEFINITIONS(-O2 -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wconversion)
+ADD_DEFINITIONS(-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wconversion)
 
 CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/Src/ScalFmmConfig.h.cmake 
 		${CMAKE_BINARY_DIR}/Src/ScalFmmConfig.h  )
diff --git a/Src/Components/FAbstractCell.hpp b/Src/Components/FAbstractCell.hpp
index f3f57fa1de98a99af3b0cbeaae606ee3dd8a9e4c..51fadf0e7d77df81df283c2fbab6fa44627b340e 100644
--- a/Src/Components/FAbstractCell.hpp
+++ b/Src/Components/FAbstractCell.hpp
@@ -1,6 +1,6 @@
 #ifndef FABSTRACTCELL_HPP
 #define FABSTRACTCELL_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FGlobal.hpp"
 
@@ -83,4 +83,4 @@ public:
 
 #endif //FABSTRACTCELL_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Components/FAbstractKernels.hpp b/Src/Components/FAbstractKernels.hpp
index 2992f4c9baf075e5a7ac03e0d6103c9127bdbdf5..1bb619b4f218cabdd1e0def0970647c4785420cc 100644
--- a/Src/Components/FAbstractKernels.hpp
+++ b/Src/Components/FAbstractKernels.hpp
@@ -1,6 +1,6 @@
 #ifndef FABSTRACTKERNELS_HPP
 #define FABSTRACTKERNELS_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FGlobal.hpp"
 
@@ -97,4 +97,4 @@ public:
 
 #endif //FABSTRACTKERNELS_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Components/FAbstractLeaf.hpp b/Src/Components/FAbstractLeaf.hpp
index a51657cc94e1ad1d98abaf805d09c2075b5e927f..27b7a6a366c50ecfd2e83e2a543714f85764fb5b 100644
--- a/Src/Components/FAbstractLeaf.hpp
+++ b/Src/Components/FAbstractLeaf.hpp
@@ -1,6 +1,6 @@
 #ifndef FABSTRACTLEAF_HPP
 #define FABSTRACTLEAF_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 
 /**
@@ -47,4 +47,4 @@ public:
 
 #endif //FABSTRACTLEAF_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Components/FAbstractParticle.hpp b/Src/Components/FAbstractParticle.hpp
index 9e7fb8c0b22d3fa8b9701bce7c72bf2173da4064..5f7e8f4f7ab1732d1f3f576eb3694aa6161ffd6e 100644
--- a/Src/Components/FAbstractParticle.hpp
+++ b/Src/Components/FAbstractParticle.hpp
@@ -1,6 +1,6 @@
 #ifndef FABSTRACTPARTICLE_HPP
 #define FABSTRACTPARTICLE_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 /* forward declaration to avoid include */
 class F3DPosition;
@@ -38,4 +38,4 @@ public:
 
 #endif //FABSTRACTPARTICLE_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Components/FBasicCell.hpp b/Src/Components/FBasicCell.hpp
index 4da9004bcefe4c6febb2ac35f29adfa600bce3ba..941e8a87dccdfb8cf26137d6fb090925b59dcc71 100644
--- a/Src/Components/FBasicCell.hpp
+++ b/Src/Components/FBasicCell.hpp
@@ -1,6 +1,6 @@
 #ifndef FBASICCELL_HPP
 #define FBASICCELL_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Extensions/FExtendPosition.hpp"
 #include "../Extensions/FExtendMortonIndex.hpp"
@@ -27,4 +27,4 @@ public:
 
 #endif //FBASICCELL_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Components/FBasicKernels.hpp b/Src/Components/FBasicKernels.hpp
index cfbed0cca9df5539af49663e46d69437aecf2e2a..87fd3c3fc015c25b151a4585507b5de613f1b2c3 100644
--- a/Src/Components/FBasicKernels.hpp
+++ b/Src/Components/FBasicKernels.hpp
@@ -1,6 +1,6 @@
 #ifndef FBASICKERNELS_HPP
 #define FBASICKERNELS_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "FAbstractKernels.hpp"
 
@@ -65,4 +65,4 @@ public:
 
 #endif //FBASICKERNELS_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Components/FBasicParticle.hpp b/Src/Components/FBasicParticle.hpp
index bc076c1485f2d16eb6917d98c345c61a79b45920..5b173647d5c336b15205cf7dc9dedaa59307056b 100644
--- a/Src/Components/FBasicParticle.hpp
+++ b/Src/Components/FBasicParticle.hpp
@@ -1,6 +1,6 @@
 #ifndef FBASICPARTICLE_HPP
 #define FBASICPARTICLE_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Extensions/FExtendPosition.hpp"
 
@@ -25,4 +25,4 @@ public:
 
 #endif //FBASICPARTICLE_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Components/FFmaParticle.hpp b/Src/Components/FFmaParticle.hpp
index 9ddb8f072408ba9ad59ba400bd0f941899fe3b34..438cbc10d7574317814502c6b90ee5bebb21d535 100644
--- a/Src/Components/FFmaParticle.hpp
+++ b/Src/Components/FFmaParticle.hpp
@@ -1,6 +1,6 @@
 #ifndef FFmaPARTICLE_HPP
 #define FFmaPARTICLE_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "FBasicParticle.hpp"
 #include "../Extensions/FExtendPhysicalValue.hpp"
@@ -23,4 +23,4 @@ public:
 
 #endif //FFmaPARTICLE_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Components/FSimpleLeaf.hpp b/Src/Components/FSimpleLeaf.hpp
index 6f27ac4e0421e921ba71fcca19726270f8200eae..82d0f45abf6c9c3c41564883f4745156dd96ac0c 100644
--- a/Src/Components/FSimpleLeaf.hpp
+++ b/Src/Components/FSimpleLeaf.hpp
@@ -1,6 +1,6 @@
 #ifndef FSIMPLELEAF_HPP
 #define FSIMPLELEAF_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "FAbstractLeaf.hpp"
 
@@ -50,4 +50,4 @@ public:
 
 #endif //FSIMPLELEAF_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Components/FTestCell.hpp b/Src/Components/FTestCell.hpp
index 2f7bbccab8bbf042a27ce44d3677a67b6be6120c..708182e1c3e46253da60f09c343ffe837abb3cee 100644
--- a/Src/Components/FTestCell.hpp
+++ b/Src/Components/FTestCell.hpp
@@ -1,6 +1,6 @@
 #ifndef FTESTCELL_HPP
 #define FTESTCELL_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "FBasicCell.hpp"
 
@@ -45,4 +45,4 @@ public:
 
 #endif //FTESTCELL_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Components/FTestKernels.hpp b/Src/Components/FTestKernels.hpp
index dfc1aef1c78de8a4a290f42509aa25b23b50feaa..74e65d4d72ae9ad6390f2762255dd2399b3ea837 100644
--- a/Src/Components/FTestKernels.hpp
+++ b/Src/Components/FTestKernels.hpp
@@ -1,6 +1,6 @@
 #ifndef FTESTKERNELS_HPP
 #define FTESTKERNELS_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 
@@ -194,4 +194,4 @@ void ValidateFMMAlgo(OctreeClass* const tree){
 
 #endif //FTESTKERNELS_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Components/FTestParticle.hpp b/Src/Components/FTestParticle.hpp
index 0d301d4ff4ae6737dd561b675b3a9c423ae307d5..a3d5e7598c8b43ed8ebd4a1a9e1afd472bd84d4b 100644
--- a/Src/Components/FTestParticle.hpp
+++ b/Src/Components/FTestParticle.hpp
@@ -1,6 +1,6 @@
 #ifndef FTESTPARTICLE_HPP
 #define FTESTPARTICLE_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "FBasicParticle.hpp"
 
@@ -38,4 +38,4 @@ public:
 
 #endif //FTESTPARTICLE_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Components/FTypedLeaf.hpp b/Src/Components/FTypedLeaf.hpp
index 0d708d0ed951355c5a367aa85012ba73f6b368c6..47249c9660928a432b998fd7b5defa4f842f3047 100644
--- a/Src/Components/FTypedLeaf.hpp
+++ b/Src/Components/FTypedLeaf.hpp
@@ -1,6 +1,6 @@
 #ifndef FTYPEDLEAF_HPP
 #define FTYPEDLEAF_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FAssertable.hpp"
 #include "FAbstractLeaf.hpp"
@@ -54,4 +54,4 @@ public:
 
 #endif //FTYPEDLEAF_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Containers/FBoolArray.hpp b/Src/Containers/FBoolArray.hpp
index 2942698e98faafac21a0fd41bebbd4382c18670f..aeec9251feaf71991b9c14d10fcbe51895c50aff 100644
--- a/Src/Containers/FBoolArray.hpp
+++ b/Src/Containers/FBoolArray.hpp
@@ -1,6 +1,6 @@
 #ifndef FBOOLARRAY_HPP
 #define FBOOLARRAY_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 // To get memcpy
 #include <cstring>
@@ -102,4 +102,4 @@ public :
 
 #endif //FBOOLARRAY_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Containers/FList.hpp b/Src/Containers/FList.hpp
index c187cf576e75622ebd605392ec50bd27c19b7ed0..5a3c166e0f94c3a4c883a00cafbb5ebfd9b8f401 100644
--- a/Src/Containers/FList.hpp
+++ b/Src/Containers/FList.hpp
@@ -1,6 +1,6 @@
 #ifndef FLIST_HPP
 #define FLIST_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FGlobal.hpp"
 
@@ -284,4 +284,4 @@ public:
 };
 
 #endif //FLIST_HPP
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Containers/FOctree.hpp b/Src/Containers/FOctree.hpp
index b490b735d81c189d4d07c68cdbe5d35cd45139b1..012dfb6391ae6ec0ea2dff88055816cca795fdb1 100644
--- a/Src/Containers/FOctree.hpp
+++ b/Src/Containers/FOctree.hpp
@@ -1,6 +1,6 @@
 #ifndef FOCTREE_HPP
 #define FOCTREE_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "FSubOctree.hpp"
 
@@ -1005,4 +1005,4 @@ public:
 };
 
 #endif //FOCTREE_HPP
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Containers/FSubOctree.hpp b/Src/Containers/FSubOctree.hpp
index d47976b54e48d44699628ee47a1c8e2b1a4a39d7..989ab476ef8c118f0ed151120c206b36256a665c 100644
--- a/Src/Containers/FSubOctree.hpp
+++ b/Src/Containers/FSubOctree.hpp
@@ -1,6 +1,6 @@
 #ifndef FSUBOCTREE_HPP
 #define FSUBOCTREE_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FGlobal.hpp"
 #include "../Utils/F3DPosition.hpp"
@@ -199,16 +199,19 @@ public:
     * Delete cells arrays and allocated cells
     */
     virtual ~FAbstractSubOctree(){
-        long cellsAtlevel = 8;
-        for( int indexLevel = 0 ; indexLevel < this->subOctreeHeight ; ++indexLevel ){
-            for( int indexCells = 0 ; indexCells < cellsAtlevel ; ++indexCells ){
+        long mostRight = rightLeafIndex;
+        long mostLeft = leftLeafIndex;
+
+        for( int indexLevel = this->subOctreeHeight - 1 ; indexLevel >= 0 ; --indexLevel ){
+            for( long indexCells = mostLeft ; indexCells <= mostRight ; ++indexCells ){
                 if(this->cells[indexLevel][indexCells]){
-                    delete this->cells[indexLevel][indexCells];
+                    //delete this->cells[indexLevel][indexCells];
                 }
             }
 
             delete [] this->cells[indexLevel];
-            cellsAtlevel <<= 3; // => * 8 >> 8^indexLevel
+            mostLeft  >>= 3;
+            mostRight >>= 3;
         }
 
         delete [] this->cells;
@@ -561,4 +564,4 @@ public:
 
 
 #endif //FSUBOCTREE_HPP
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Containers/FTreeCoordinate.hpp b/Src/Containers/FTreeCoordinate.hpp
index 62f19c9326db534564b7e2d1d0f8928ed73bbed4..261c8afe4d5287861e4806df09078fad06d11c67 100644
--- a/Src/Containers/FTreeCoordinate.hpp
+++ b/Src/Containers/FTreeCoordinate.hpp
@@ -1,6 +1,6 @@
 #ifndef FTREECOORDINATE_HPP
 #define FTREECOORDINATE_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FGlobal.hpp"
 
@@ -194,4 +194,4 @@ public:
 
 #endif //FTREECOORDINATE_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Containers/FVector.hpp b/Src/Containers/FVector.hpp
index 5a5ee1d84db30125b63c8128fa8eeb30d8dd323a..4ef4a217daabaabdd86be2c7d6fd9e5ed960dfc9 100644
--- a/Src/Containers/FVector.hpp
+++ b/Src/Containers/FVector.hpp
@@ -1,6 +1,6 @@
 #ifndef FVECTOR_HPP
 #define FVECTOR_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FGlobal.hpp"
 
diff --git a/Src/Core/FFmmAlgorithm.hpp b/Src/Core/FFmmAlgorithm.hpp
index f48a7b8dcf1c960738af25ebc1bea5b4db656802..f03447e421a214c2c5f98ecf1cc0366f043f0b25 100644
--- a/Src/Core/FFmmAlgorithm.hpp
+++ b/Src/Core/FFmmAlgorithm.hpp
@@ -1,6 +1,6 @@
 #ifndef FFMMALGORITHM_HPP
 #define FFMMALGORITHM_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FGlobal.hpp"
 #include "../Utils/FAssertable.hpp"
@@ -243,4 +243,4 @@ private:
 
 #endif //FFMMALGORITHM_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Core/FFmmAlgorithmPeriodic.hpp b/Src/Core/FFmmAlgorithmPeriodic.hpp
index d69804c04e105b4f5c15796a8c9974a162880684..5ef718399006a7bc18c67eb2b32f95d3489a602e 100644
--- a/Src/Core/FFmmAlgorithmPeriodic.hpp
+++ b/Src/Core/FFmmAlgorithmPeriodic.hpp
@@ -1,6 +1,6 @@
 #ifndef FFMMALGORITHMPERIODIC_HPP
 #define FFMMALGORITHMPERIODIC_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FGlobal.hpp"
 #include "../Utils/FAssertable.hpp"
diff --git a/Src/Core/FFmmAlgorithmTask.hpp b/Src/Core/FFmmAlgorithmTask.hpp
index a5cbd9525124013c373f82c59d646a4ea147e33c..e51710d17a9e2497cff2078c181d923e71b944ad 100644
--- a/Src/Core/FFmmAlgorithmTask.hpp
+++ b/Src/Core/FFmmAlgorithmTask.hpp
@@ -1,6 +1,6 @@
 #ifndef FFMMALGORITHMTASK_HPP
 #define FFMMALGORITHMTASK_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FGlobal.hpp"
 #include "../Utils/FAssertable.hpp"
@@ -329,4 +329,4 @@ private:
 
 #endif //FFMMALGORITHMTASK_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Core/FFmmAlgorithmThread.hpp b/Src/Core/FFmmAlgorithmThread.hpp
index dbfa58252aef09c17745e0a5cca80cecb4951814..8cf3f8a6da769e685f613b61d350474be9155176 100644
--- a/Src/Core/FFmmAlgorithmThread.hpp
+++ b/Src/Core/FFmmAlgorithmThread.hpp
@@ -1,6 +1,6 @@
 #ifndef FFMMALGORITHMTHREAD_HPP
 #define FFMMALGORITHMTHREAD_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FAssertable.hpp"
 #include "../Utils/FDebug.hpp"
@@ -400,4 +400,4 @@ private:
 
 #endif //FFMMALGORITHMTHREAD_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Core/FFmmAlgorithmThreadProc.hpp b/Src/Core/FFmmAlgorithmThreadProc.hpp
index 83c86a41ea35e029aaf9ba47b060fd2a4bb4367f..1dc99669f560f04de8e2faf59c19ec9c066435cd 100644
--- a/Src/Core/FFmmAlgorithmThreadProc.hpp
+++ b/Src/Core/FFmmAlgorithmThreadProc.hpp
@@ -1,6 +1,6 @@
 #ifndef FFMMALGORITHMTHREADPROC_HPP
 #define FFMMALGORITHMTHREADPROC_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FAssertable.hpp"
 #include "../Utils/FDebug.hpp"
@@ -1311,4 +1311,4 @@ private:
 
 #endif //FFMMALGORITHMTHREAD_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Core/FFmmAlgorithmThreadProcPeriodic.hpp b/Src/Core/FFmmAlgorithmThreadProcPeriodic.hpp
index ab064a08de9e292ff3b6d039400718023dff288e..aa69fb6a5576cd5dc766f68fa274e72be237717e 100644
--- a/Src/Core/FFmmAlgorithmThreadProcPeriodic.hpp
+++ b/Src/Core/FFmmAlgorithmThreadProcPeriodic.hpp
@@ -1,6 +1,6 @@
 #ifndef FFmmAlgorithmThreadProcPeriodicPERIODIC_HPP
 #define FFmmAlgorithmThreadProcPeriodicPERIODIC_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FAssertable.hpp"
 #include "../Utils/FDebug.hpp"
@@ -1499,4 +1499,4 @@ private:
 
 #endif //FFMMALGORITHMTHREAD_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Core/FFmmAlgorithmThreadTsm.hpp b/Src/Core/FFmmAlgorithmThreadTsm.hpp
index 183cb117fbdc72e5205167af36cc3cd71d1763d8..e0d88c1fda8681d48a4ed2c642d8d95603c8c5bf 100644
--- a/Src/Core/FFmmAlgorithmThreadTsm.hpp
+++ b/Src/Core/FFmmAlgorithmThreadTsm.hpp
@@ -1,6 +1,6 @@
 #ifndef FFMMALGORITHMTHREADTSM_HPP
 #define FFMMALGORITHMTHREADTSM_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FAssertable.hpp"
 #include "../Utils/FDebug.hpp"
@@ -353,4 +353,4 @@ public:
 
 #endif //FFMMALGORITHMTHREADTSM_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Core/FFmmAlgorithmTsm.hpp b/Src/Core/FFmmAlgorithmTsm.hpp
index df92e1cd43af31d34723e0088afd9ee28179e341..5ee1ccd3b63a0b80c412eb888b99aa6cb57cd749 100644
--- a/Src/Core/FFmmAlgorithmTsm.hpp
+++ b/Src/Core/FFmmAlgorithmTsm.hpp
@@ -1,6 +1,6 @@
 #ifndef FFMMALGORITHMTSM_HPP
 #define FFMMALGORITHMTSM_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FAssertable.hpp"
 #include "../Utils/FDebug.hpp"
@@ -282,4 +282,4 @@ public:
 
 #endif //FFMMALGORITHMTSM_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Extensions/FExtendCellType.hpp b/Src/Extensions/FExtendCellType.hpp
index 47d5ca657c17bba12a845349687bbf31442304cd..654f98ccda7040345c6bfa63f2b40cf67530c397 100644
--- a/Src/Extensions/FExtendCellType.hpp
+++ b/Src/Extensions/FExtendCellType.hpp
@@ -1,6 +1,6 @@
 #ifndef FEXTENDCELLTYPE_HPP
 #define FEXTENDCELLTYPE_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 
 /**
@@ -62,4 +62,4 @@ public:
 
 #endif //FEXTENDCELLTYPE_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Extensions/FExtendCoordinate.hpp b/Src/Extensions/FExtendCoordinate.hpp
index 649a9b021403d7047d54d8aee2ceb854fbdbc64a..4dc999f29a7fd467f8e1e4482287b07fb7e3ab03 100644
--- a/Src/Extensions/FExtendCoordinate.hpp
+++ b/Src/Extensions/FExtendCoordinate.hpp
@@ -1,6 +1,6 @@
 #ifndef FEXTENDCOORDINATE_HPP
 #define FEXTENDCOORDINATE_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FGlobal.hpp"
 #include "../Containers/FTreeCoordinate.hpp"
@@ -53,4 +53,4 @@ public:
 
 #endif //FEXTENDCOORDINATE_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Extensions/FExtendForces.hpp b/Src/Extensions/FExtendForces.hpp
index 5fa0367690871a1dc734759ba968478e47b7b988..2063407c8237634d86eb62ec4e65c8a19226c474 100644
--- a/Src/Extensions/FExtendForces.hpp
+++ b/Src/Extensions/FExtendForces.hpp
@@ -1,6 +1,6 @@
 #ifndef FEXTENDFORCES_HPP
 #define FEXTENDFORCES_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FGlobal.hpp"
 #include "../Utils/F3DPosition.hpp"
@@ -54,4 +54,4 @@ public:
 
 #endif //FEXTENDFORCES_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Extensions/FExtendMortonIndex.hpp b/Src/Extensions/FExtendMortonIndex.hpp
index 288082648625aea204f032e763e6423c070a23a5..486724c8f2e8d03b3d0cf16c03c4fa7ef5d35711 100644
--- a/Src/Extensions/FExtendMortonIndex.hpp
+++ b/Src/Extensions/FExtendMortonIndex.hpp
@@ -1,6 +1,6 @@
 #ifndef FEXTENDMORTONINDEX_HPP
 #define FEXTENDMORTONINDEX_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FGlobal.hpp"
 #include "../Containers/FTreeCoordinate.hpp"
@@ -46,4 +46,4 @@ public:
 
 #endif //FEXTENDMORTONINDEX_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Extensions/FExtendParticleType.hpp b/Src/Extensions/FExtendParticleType.hpp
index 24f31dc10fdcf5608076330c1cd575dfcec83eb9..6bfd60c81b460679fc36f1d130d4f93d584ac64a 100644
--- a/Src/Extensions/FExtendParticleType.hpp
+++ b/Src/Extensions/FExtendParticleType.hpp
@@ -1,6 +1,6 @@
 #ifndef FEXTENDPARTICLETYPE_HPP
 #define FEXTENDPARTICLETYPE_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 
 /**
@@ -77,4 +77,4 @@ public:
 
 #endif //FEXTENDPARTICLETYPE_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Extensions/FExtendPhysicalValue.hpp b/Src/Extensions/FExtendPhysicalValue.hpp
index 9207506c5924eb85d6c0be21112e9980aa71cbb2..cd7fea2628acbdba3cda0a6a63e8c7f880dc50e1 100644
--- a/Src/Extensions/FExtendPhysicalValue.hpp
+++ b/Src/Extensions/FExtendPhysicalValue.hpp
@@ -1,6 +1,6 @@
 #ifndef FExtendPhysicalValue_HPP
 #define FExtendPhysicalValue_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FGlobal.hpp"
 
@@ -45,4 +45,4 @@ public:
 
 #endif //FExtendPhysicalValue_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Extensions/FExtendPosition.hpp b/Src/Extensions/FExtendPosition.hpp
index 74c57d7327780432f227b611d0cbafaf4fd4c3c3..5ea5a95870846d3ae870403b19006fd3c2dc64d0 100644
--- a/Src/Extensions/FExtendPosition.hpp
+++ b/Src/Extensions/FExtendPosition.hpp
@@ -1,6 +1,6 @@
 #ifndef FEXTENDPOSITION_HPP
 #define FEXTENDPOSITION_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FGlobal.hpp"
 #include "../Utils/F3DPosition.hpp"
@@ -53,4 +53,4 @@ public:
 
 #endif //FEXTENDPOSITION_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Extensions/FExtendPotential.hpp b/Src/Extensions/FExtendPotential.hpp
index 4114357158cc576738f9eff1a90fde80eab87b69..74b3c3bc8024a52c3c42a2eacc1d47252d28c211 100644
--- a/Src/Extensions/FExtendPotential.hpp
+++ b/Src/Extensions/FExtendPotential.hpp
@@ -1,6 +1,6 @@
 #ifndef FEXTENDPOTENTIAL_HPP
 #define FEXTENDPOTENTIAL_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FGlobal.hpp"
 
@@ -50,4 +50,4 @@ public:
 
 #endif //FEXTENDPOTENTIAL_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Files/FAbstractLoader.hpp b/Src/Files/FAbstractLoader.hpp
index 4e8e54e405a107d3f62c0a6082a89a8d61e10b44..7c8d8673918ead36e209f51d39d3abddc65a9f46 100644
--- a/Src/Files/FAbstractLoader.hpp
+++ b/Src/Files/FAbstractLoader.hpp
@@ -1,6 +1,6 @@
 #ifndef FABSTRACTLOADER_HPP
 #define FABSTRACTLOADER_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FGlobal.hpp"
 class F3DPosition;
@@ -61,4 +61,4 @@ public:
 
 #endif //FABSTRACTLOADER_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Files/FBasicLoader.hpp b/Src/Files/FBasicLoader.hpp
index 3a9465b57e5cb472e66b6010e963a7d61ff9c046..a9ddc5be95874594e61496cbd20c9c1719ba0c5f 100644
--- a/Src/Files/FBasicLoader.hpp
+++ b/Src/Files/FBasicLoader.hpp
@@ -1,6 +1,6 @@
 #ifndef FBASICLOADER_HPP
 #define FBASICLOADER_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 #include <fstream>
@@ -116,4 +116,4 @@ public:
 
 #endif //FBASICLOADER_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Files/FFmaBinLoader.hpp b/Src/Files/FFmaBinLoader.hpp
index 8f8447ad8da14c473b82d86612f9f11e2d42ca4f..0d2d2eccdb6644f7d2a5833fa7b42485d9809b16 100644
--- a/Src/Files/FFmaBinLoader.hpp
+++ b/Src/Files/FFmaBinLoader.hpp
@@ -1,6 +1,6 @@
 #ifndef FFMABINLOADER_HPP
 #define FFMABINLOADER_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <cstdio>
 
@@ -139,4 +139,4 @@ public:
 
 #endif //FFmaBinLoader_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Files/FFmaLoader.hpp b/Src/Files/FFmaLoader.hpp
index ca59d39043438575455dad4dbd5f795820cf8329..3a2ca50d1f18f4b6d8ba35bfc4f4b7ecfc67c487 100644
--- a/Src/Files/FFmaLoader.hpp
+++ b/Src/Files/FFmaLoader.hpp
@@ -1,6 +1,6 @@
 #ifndef FFMALOADER_HPP
 #define FFMALOADER_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 #include <fstream>
@@ -120,4 +120,4 @@ public:
 
 #endif //FFmaLoader_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Files/FFmaScanfLoader.hpp b/Src/Files/FFmaScanfLoader.hpp
index 4bd9cd6b5f7ed99b7d7671ea29d3a21ee90c2d58..9c6264daced13a5ede6219e95add523354857b61 100644
--- a/Src/Files/FFmaScanfLoader.hpp
+++ b/Src/Files/FFmaScanfLoader.hpp
@@ -1,6 +1,6 @@
 #ifndef FFMASCANFLOADER_HPP
 #define FFMASCANFLOADER_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 #include <fstream>
@@ -135,4 +135,4 @@ public:
 
 #endif //FFMASCANFLOADER_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Files/FFmaTsmLoader.hpp b/Src/Files/FFmaTsmLoader.hpp
index 8d151712c18b9e7f245673cb423d13274d43bc03..2db9f626602229c4014d9f2b57f3c1a371d2cc6d 100644
--- a/Src/Files/FFmaTsmLoader.hpp
+++ b/Src/Files/FFmaTsmLoader.hpp
@@ -1,6 +1,6 @@
 #ifndef FFMATSMLOADER_HPP
 #define FFMATSMLOADER_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 #include <fstream>
@@ -123,4 +123,4 @@ public:
 
 #endif //FFMATSMLOADER_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Files/FHLoader.hpp b/Src/Files/FHLoader.hpp
index 80c2c3d9ed5dc6f25913eece7e487e95fdb6c1c8..229cf5d8d531e4a28b71159a24b494a31d71faf5 100644
--- a/Src/Files/FHLoader.hpp
+++ b/Src/Files/FHLoader.hpp
@@ -1,6 +1,6 @@
 #ifndef FHLOADER_HPP
 #define FHLOADER_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 #include <fstream>
@@ -140,4 +140,4 @@ public:
 
 #endif //FHLOADER_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Files/FMpiFmaLoader.hpp b/Src/Files/FMpiFmaLoader.hpp
index d8a0a35c2445852d2cd50268b4fa382ce2bb6dda..4c98b03b332218302e4b394593d094892f086021 100644
--- a/Src/Files/FMpiFmaLoader.hpp
+++ b/Src/Files/FMpiFmaLoader.hpp
@@ -1,6 +1,6 @@
 #ifndef FMPIFMALOADER_HPP
 #define FMPIFMALOADER_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 #include <fstream>
@@ -223,4 +223,4 @@ public:
 
 #endif //FMPIFMALOADER_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Files/FTreeIO.hpp b/Src/Files/FTreeIO.hpp
index 0ecfde9e5d84d9de9140470be0dc8b84b5fd2ca3..5f94110de23df91d6ae1b4ec1a132bd8c8fe73e4 100644
--- a/Src/Files/FTreeIO.hpp
+++ b/Src/Files/FTreeIO.hpp
@@ -206,7 +206,7 @@ public:
                 }
             }
 
-            delete[] particles;
+            //delete[] particles;
         }
 
         // Start from leal level - 1
diff --git a/Src/Fmb/FExtendFmbCell.hpp b/Src/Fmb/FExtendFmbCell.hpp
index 0eb8af7fe5569819cf821ab2f193dd35fc19f0c1..ba335a2431662a0c96e52dfd5ccb9b4bffa63aae 100644
--- a/Src/Fmb/FExtendFmbCell.hpp
+++ b/Src/Fmb/FExtendFmbCell.hpp
@@ -1,6 +1,6 @@
 #ifndef FEXTENDFMBCELL_HPP
 #define FEXTENDFMBCELL_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <string.h>
 
@@ -69,4 +69,4 @@ public:
 
 #endif //FEXTENDFMBCELL_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Fmb/FFmbKernels.hpp b/Src/Fmb/FFmbKernels.hpp
index 2e7baae9ad36cbfce4e603c651c053a68242212b..5eed37de19caa1fe38343c218f7c7f4529c85918 100644
--- a/Src/Fmb/FFmbKernels.hpp
+++ b/Src/Fmb/FFmbKernels.hpp
@@ -1,6 +1,6 @@
 #ifndef FFMBKERNELS_HPP
 #define FFMBKERNELS_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FGlobal.hpp"
 #include "../Components/FAbstractKernels.hpp"
@@ -1500,4 +1500,4 @@ const FReal FFmbKernels<ParticleClass,CellClass, ContainerClass>::PiArrayOuter[4
 
 #endif //FFMBKERNELS_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Fmb/FFmbKernelsBlas.hpp b/Src/Fmb/FFmbKernelsBlas.hpp
index 9dad6dbdc5d63e749aa51f896290f3f6d326229e..fc4adaa81af73db193b130e8d697174770fb2eae 100644
--- a/Src/Fmb/FFmbKernelsBlas.hpp
+++ b/Src/Fmb/FFmbKernelsBlas.hpp
@@ -1,6 +1,6 @@
 #ifndef FFMBKERNELSBLAS_HPP
 #define FFMBKERNELSBLAS_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FGlobal.hpp"
 #include "../Utils/FBlas.hpp"
@@ -1536,4 +1536,4 @@ const FReal FFmbKernelsBlas<ParticleClass,CellClass,ContainerClass>::PiArrayOute
 
 #endif //FFMBKERNELSBLAS_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Fmb/FFmbKernelsBlockBlas.hpp b/Src/Fmb/FFmbKernelsBlockBlas.hpp
index 95b821fd80c0c5c7bc5033cbebbc4960d2488e35..4a0d4a1d67952968ed7e4e8633a0f6c988d11add 100644
--- a/Src/Fmb/FFmbKernelsBlockBlas.hpp
+++ b/Src/Fmb/FFmbKernelsBlockBlas.hpp
@@ -1,6 +1,6 @@
 #ifndef FFMBKERNELSBLOCKBLAS_HPP
 #define FFMBKERNELSBLOCKBLAS_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Utils/FGlobal.hpp"
 #include "../Utils/FBlas.hpp"
@@ -1787,4 +1787,4 @@ const FReal FFmbKernelsBlockBlas<ParticleClass,CellClass,ContainerClass>::PiArra
 
 #endif //FFMBKERNELSBLOCKBLAS_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Utils/F3DPosition.hpp b/Src/Utils/F3DPosition.hpp
index 8b2426dd924226712de925e7d28d98f7f3c8570b..6802529668e5f9c65f14330c267c8f46e5c60055 100644
--- a/Src/Utils/F3DPosition.hpp
+++ b/Src/Utils/F3DPosition.hpp
@@ -1,6 +1,6 @@
 #ifndef F3DPOSITION_HPP
 #define F3DPOSITION_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 // To get memcpy
 #include <cstring>
@@ -251,4 +251,4 @@ public:
 
 #endif //F3DPOSITION_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Utils/FAbstractSendable.hpp b/Src/Utils/FAbstractSendable.hpp
index bcccf49e45e0a219aa0de602932dbfdb19e50dc9..1728c737dd7c0a6dad3281e6eef54420c33d1991 100644
--- a/Src/Utils/FAbstractSendable.hpp
+++ b/Src/Utils/FAbstractSendable.hpp
@@ -1,6 +1,6 @@
 #ifndef FABSTRACTSENDABLE_HPP
 #define FABSTRACTSENDABLE_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 
 /**
@@ -24,4 +24,4 @@ protected:
 
 #endif //FABSTRACTSENDABLE_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Utils/FAssertable.hpp b/Src/Utils/FAssertable.hpp
index 7aba0bce43b2c4727b4e7ce8236519fb35744832..c3dbf2c7095178ea80e54be305d066acf58dbaa9 100644
--- a/Src/Utils/FAssertable.hpp
+++ b/Src/Utils/FAssertable.hpp
@@ -1,6 +1,6 @@
 #ifndef FASSERTABLE_HPP
 #define FASSERTABLE_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <stdlib.h>
 #include <sstream>
@@ -49,4 +49,4 @@ protected:
 
 #endif //FASSERTABLE_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Utils/FComplexe.hpp b/Src/Utils/FComplexe.hpp
index 90722566ef014d21d61758d81ffce3217f70cd2a..8f51b90ab051acf2131e059e6ceaf8d487e43157 100644
--- a/Src/Utils/FComplexe.hpp
+++ b/Src/Utils/FComplexe.hpp
@@ -1,6 +1,6 @@
 #ifndef FCOMPLEXE_HPP
 #define FCOMPLEXE_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "FMath.hpp"
 
@@ -149,4 +149,4 @@ inline FComplexe operator*=(const FComplexe& first, const FComplexe& second){
 
 #endif //FCOMPLEXE_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Utils/FDebug.hpp b/Src/Utils/FDebug.hpp
index a9ffbc48260a6e4453316989891d5b8e97a94356..c96664bdfbbac5157fa11c201f1c4197e4c8f294 100644
--- a/Src/Utils/FDebug.hpp
+++ b/Src/Utils/FDebug.hpp
@@ -1,6 +1,6 @@
 #ifndef FDEBUG_HPP
 #define FDEBUG_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "FGlobal.hpp"
 
@@ -182,4 +182,4 @@ public:
 
 #endif //FDEBUG_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Utils/FMath.hpp b/Src/Utils/FMath.hpp
index 47dade150d19bfce4b7ebc94256b071dd76a2864..b095358f8c1d8da409fd9c5b41d2b5c166af9238 100644
--- a/Src/Utils/FMath.hpp
+++ b/Src/Utils/FMath.hpp
@@ -1,6 +1,6 @@
 #ifndef FMATH_HPP
 #define FMATH_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <math.h>
 #include "FGlobal.hpp"
@@ -126,4 +126,4 @@ struct FMath{
 
 #endif //FMATH_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Utils/FMemStats.h b/Src/Utils/FMemStats.h
index 1a3fc83be408b94412e7bfa6f5df51df16d7c985..80c5d878773b3cf8e503509ea751516525601bb8 100644
--- a/Src/Utils/FMemStats.h
+++ b/Src/Utils/FMemStats.h
@@ -2,11 +2,13 @@
 #define FMEMSTATS_H
 
 
-#include <new>
-#include <stdexcept>
 #include <stdlib.h>
+#include <cstring>
 
 #ifdef SCALFMM_USE_MEM_STATS
+#include <new>
+#include <stdexcept>
+#warning use meme stats
     void* operator new(std::size_t n) throw(std::bad_alloc);
     void* operator new(size_t n, std::nothrow_t const&) throw();
     void* operator new[](size_t n) throw(std::bad_alloc);
@@ -40,6 +42,7 @@ private:
         currentAllocated -= size;
     }
 
+#ifdef SCALFMM_USE_MEM_STATS
     friend void* operator new(std::size_t n) throw(std::bad_alloc);
     friend void* operator new(size_t n, std::nothrow_t const&) throw();
     friend void* operator new[](size_t n) throw(std::bad_alloc);
@@ -48,6 +51,7 @@ private:
     friend void operator delete(void* p, std::nothrow_t const&) throw();
     friend void operator delete[](void* p) throw();
     friend void operator delete[](void* p, std::nothrow_t const&) throw();
+#endif
 
 public:
     static FMemStats controler;
diff --git a/Src/Utils/FMpi.hpp b/Src/Utils/FMpi.hpp
index 304f8206210f25439456350f012ce6f11beff4aa..ba046b9bb03e11db35186a711b36867d1b100b46 100644
--- a/Src/Utils/FMpi.hpp
+++ b/Src/Utils/FMpi.hpp
@@ -1,6 +1,6 @@
 #ifndef FMPI_HPP
 #define FMPI_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "FGlobal.hpp"
 #include "FMath.hpp"
@@ -303,4 +303,4 @@ private:
 
 #endif //FMPI_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Src/Utils/FTrace.hpp b/Src/Utils/FTrace.hpp
index 52d28e1fa374bf0c977b92da2da8cafe5741caaa..af69a6503e699bc32c67db9e01ac51112bde19db 100644
--- a/Src/Utils/FTrace.hpp
+++ b/Src/Utils/FTrace.hpp
@@ -1,6 +1,6 @@
 #ifndef FTRACE_HPP
 #define FTRACE_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "FGlobal.hpp"
 
@@ -153,4 +153,4 @@ public:
 
 #endif //FTRACE_HPP
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testDebug.cpp b/Tests/testDebug.cpp
index a02ddb8895c3475a29d41cd25cb230615df28280..c1ad27d956cdf03a540cc784e67d8881e9d8ee22 100644
--- a/Tests/testDebug.cpp
+++ b/Tests/testDebug.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Src/Utils/FDebug.hpp"
 
@@ -36,4 +36,4 @@ int main(void){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testFmbAlgorithm.cpp b/Tests/testFmbAlgorithm.cpp
index 68c2786ba16112c570255c7f4f9462d223525e8c..8314c5479ebc1c2e8cbe1fe2ca54a7d2650bd38a 100644
--- a/Tests/testFmbAlgorithm.cpp
+++ b/Tests/testFmbAlgorithm.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 
@@ -131,4 +131,4 @@ int main(int argc, char ** argv){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testFmbAlgorithmProc.cpp b/Tests/testFmbAlgorithmProc.cpp
index 11e7d5e8d2d3e179df4c23baab18c0b4eb439d26..90cec26e2243a55b392dddc2ef673400bd8c1b05 100644
--- a/Tests/testFmbAlgorithmProc.cpp
+++ b/Tests/testFmbAlgorithmProc.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 
 #include "../Src/Utils/FTic.hpp"
@@ -342,4 +342,4 @@ int main(int argc, char ** argv){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testFmbBlasAlgorithm.cpp b/Tests/testFmbBlasAlgorithm.cpp
index 5d22b62bf3aa911c0b8b7f897ca0db23dcc47699..2f98d080daa40cb900c0d22b97a90ae28fadd9bf 100644
--- a/Tests/testFmbBlasAlgorithm.cpp
+++ b/Tests/testFmbBlasAlgorithm.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 
@@ -131,4 +131,4 @@ int main(int argc, char ** argv){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testFmbTsmAlgorithm.cpp b/Tests/testFmbTsmAlgorithm.cpp
index 4bfefe6272771461f86c95e054d4ade1b2f48d32..2455644771ac1ed5e8111f9cbabc2f31a1fdceea 100644
--- a/Tests/testFmbTsmAlgorithm.cpp
+++ b/Tests/testFmbTsmAlgorithm.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 
@@ -127,4 +127,4 @@ int main(int argc, char ** argv){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testFmbTsmNoTsm.cpp b/Tests/testFmbTsmNoTsm.cpp
index 2b29a2adcdc9b1fcd6e057292f0fd6636249b5bb..5463f742fb565ed9c9d8933d18292ad88a1f9ed9 100644
--- a/Tests/testFmbTsmNoTsm.cpp
+++ b/Tests/testFmbTsmNoTsm.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 
@@ -181,4 +181,4 @@ int main(int argc, char ** argv){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testFmmAlgorithm.cpp b/Tests/testFmmAlgorithm.cpp
index 6dd453e8c8931bddf7c34c32e2c8e6edca714b1d..98850e71b0b54bfaab8ca7accd9cbc7abd78fdd9 100644
--- a/Tests/testFmmAlgorithm.cpp
+++ b/Tests/testFmmAlgorithm.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 
@@ -109,4 +109,4 @@ int main(int argc, char ** argv){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testFmmAlgorithmPeriodic.cpp b/Tests/testFmmAlgorithmPeriodic.cpp
index 722e9e1863c419b8c3b11ebe50ca952d18946840..a54f6f0e798206ae3e965e5ad30ecf4c47669c8f 100644
--- a/Tests/testFmmAlgorithmPeriodic.cpp
+++ b/Tests/testFmmAlgorithmPeriodic.cpp
@@ -1,5 +1,5 @@
 
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 
@@ -264,4 +264,4 @@ int main(int argc, char ** argv){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testFmmAlgorithmProc.cpp b/Tests/testFmmAlgorithmProc.cpp
index 222c7f6a53e42922970d113dfa1cf102ad2e54d6..1b888acfa7f763902f280fd0ca7e2e017478e3f7 100644
--- a/Tests/testFmmAlgorithmProc.cpp
+++ b/Tests/testFmmAlgorithmProc.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include "../Src/Utils/FMpi.hpp"
 #include "../Src/Utils/FTic.hpp"
@@ -440,4 +440,4 @@ int main(int argc, char ** argv){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testFmmAlgorithmProcPeriodic.cpp b/Tests/testFmmAlgorithmProcPeriodic.cpp
index 2fdc8885a1859f9bdf0fe3e33eea4ad1b4974206..3d8c75d6d975b54f0f0e67c095a2b060c96af167 100644
--- a/Tests/testFmmAlgorithmProcPeriodic.cpp
+++ b/Tests/testFmmAlgorithmProcPeriodic.cpp
@@ -1,5 +1,5 @@
 
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 
@@ -315,4 +315,4 @@ int main(int argc, char ** argv){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testFmmAlgorithmTsm.cpp b/Tests/testFmmAlgorithmTsm.cpp
index f93626b461204b972b5f3bc28afce6410f15149d..76e1b4e251d5390ab725a1a1f315204470088cc5 100644
--- a/Tests/testFmmAlgorithmTsm.cpp
+++ b/Tests/testFmmAlgorithmTsm.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 
@@ -113,4 +113,4 @@ int main(int argc, char ** argv){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testFmmDemonstration.cpp b/Tests/testFmmDemonstration.cpp
index 2eb26ff6c6b47806e076a611a5bfaadad08dea4d..8021cc98050ea7edd2a2a390376c4bb1a1424acc 100644
--- a/Tests/testFmmDemonstration.cpp
+++ b/Tests/testFmmDemonstration.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 
@@ -205,4 +205,4 @@ int main(int argc, char ** argv){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testLoader.cpp b/Tests/testLoader.cpp
index ea1ecad411a65691f940947cef4b79783b9ab8e9..a96af40669c7d5605b10a591def1f4b6c6e88e72 100644
--- a/Tests/testLoader.cpp
+++ b/Tests/testLoader.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 
@@ -97,4 +97,4 @@ int main(int argc, char ** argv){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testLoaderCreate.cpp b/Tests/testLoaderCreate.cpp
index 5b852e589530c620a742403abb7044971d0b8628..44af1714890614be53f7438dc4c4486949eea82c 100644
--- a/Tests/testLoaderCreate.cpp
+++ b/Tests/testLoaderCreate.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 #include <fstream>
@@ -79,4 +79,4 @@ int main(int argc, char ** argv){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testLoaderFMA.cpp b/Tests/testLoaderFMA.cpp
index e51c4490936834e58d02cded6ed9ee8873753883..48690aa83cb4e6c90da020adc6c7c08cbabc281d 100644
--- a/Tests/testLoaderFMA.cpp
+++ b/Tests/testLoaderFMA.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 
@@ -95,4 +95,4 @@ int main(int argc, char ** argv ){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testLoaderFMABinCreate.cpp b/Tests/testLoaderFMABinCreate.cpp
index b15058a24468f8f793ca2793e34a82ac9c6fdaa4..aa5c7438c94352869394908bb86e6747564569cb 100644
--- a/Tests/testLoaderFMABinCreate.cpp
+++ b/Tests/testLoaderFMABinCreate.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 #include <fstream>
@@ -94,4 +94,4 @@ int main(int argc, char ** argv){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testLoaderFMACreate.cpp b/Tests/testLoaderFMACreate.cpp
index fecd07ebba5eb30090485868709be53f9863c790..979c624d0691ccf40dc24d48c0957fc633d3b89a 100644
--- a/Tests/testLoaderFMACreate.cpp
+++ b/Tests/testLoaderFMACreate.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 #include <fstream>
@@ -86,4 +86,4 @@ int main(int argc, char ** argv){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testLoaderFMACreateSphere.cpp b/Tests/testLoaderFMACreateSphere.cpp
index b343cd8b00f39844de1b8dbd06ed320c53e28513..9c6cf359fadd60b360e9440693316ffad4939741 100644
--- a/Tests/testLoaderFMACreateSphere.cpp
+++ b/Tests/testLoaderFMACreateSphere.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 #include <fstream>
@@ -91,4 +91,4 @@ int main(int argc, char ** argv){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testLoaderFMATsm.cpp b/Tests/testLoaderFMATsm.cpp
index f819e4dacf7fe3576c9642efdcabf4fffefa35c1..25d8f02413fc19e503615eb5065d4c084c48f266 100644
--- a/Tests/testLoaderFMATsm.cpp
+++ b/Tests/testLoaderFMATsm.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 
@@ -90,4 +90,4 @@ int main(int argc, char ** argv ){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testLoaderFMATsmCreate.cpp b/Tests/testLoaderFMATsmCreate.cpp
index 332c0d171ae95f9fa4d7a00b63a50f2462d6b1dc..2051b75cfe6846473e7ec6c035886941ecb335a0 100644
--- a/Tests/testLoaderFMATsmCreate.cpp
+++ b/Tests/testLoaderFMATsmCreate.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 #include <fstream>
@@ -83,4 +83,4 @@ int main(int argc, char ** argv){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testMemStats.cpp b/Tests/testMemStats.cpp
index 2f740b7ab569d3066ce7e34d483f8bd4f64ceac0..8ba4f5be61449ea2e40142c8345e3bbd6337df59 100644
--- a/Tests/testMemStats.cpp
+++ b/Tests/testMemStats.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 
@@ -113,4 +113,4 @@ int main(int argc, char ** argv){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testMortonIndex.cpp b/Tests/testMortonIndex.cpp
index 64e553a4e9d4b9cd6837e0eaeaece8dee1d98d4a..8b147ac48070a22ade0ff296e8d26aa5248010a8 100644
--- a/Tests/testMortonIndex.cpp
+++ b/Tests/testMortonIndex.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 
@@ -187,4 +187,4 @@ int main(int argc, char ** argv){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testOctree.cpp b/Tests/testOctree.cpp
index a6567dd824c3bdcabf719e3e74c8f5ebcf992db4..433d234c5ba7504cd4ed6be0d6c8bca41f5aafa0 100644
--- a/Tests/testOctree.cpp
+++ b/Tests/testOctree.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 
@@ -62,4 +62,4 @@ int main(int , char ** ){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testOctreeIter.cpp b/Tests/testOctreeIter.cpp
index c45df0db8879853cde3f99dfe2a7dbd28a618ef6..9d26b4110a99197870e9765965abf321d5b5e5e4 100644
--- a/Tests/testOctreeIter.cpp
+++ b/Tests/testOctreeIter.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 
@@ -106,4 +106,4 @@ int main(int , char ** ){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testOctreePrintMorton.cpp b/Tests/testOctreePrintMorton.cpp
index 1bcf6b9b33572955f741466096e59353f017d5c6..059daf9f7feb0b1c14ed3aff44d2ba01698d2e8c 100644
--- a/Tests/testOctreePrintMorton.cpp
+++ b/Tests/testOctreePrintMorton.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 
@@ -275,4 +275,4 @@ int main(int , char ** ){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testOctreeRearrange.cpp b/Tests/testOctreeRearrange.cpp
index c4ddef6b5d46e48fd894239cda55f55713fd9187..17f91a1dff6cd755d1b1b7afc028d10e837faae0 100644
--- a/Tests/testOctreeRearrange.cpp
+++ b/Tests/testOctreeRearrange.cpp
@@ -1,6 +1,6 @@
 
 
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 
@@ -187,4 +187,4 @@ int main(int argc, char ** argv){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testOctreeRearrangeProc.cpp b/Tests/testOctreeRearrangeProc.cpp
index 9639fe7adeb5bb19340534ee8b2c73fde4df67db..d7325317703cad1aa755e621baac8c58d5940247 100644
--- a/Tests/testOctreeRearrangeProc.cpp
+++ b/Tests/testOctreeRearrangeProc.cpp
@@ -1,6 +1,6 @@
 
 
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 
@@ -209,4 +209,4 @@ int main(int argc, char ** argv){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testStatsTree.cpp b/Tests/testStatsTree.cpp
index 6370a3598cec84157d1b54bed5b98ef1efb7c486..dfe0a9e2010ca14687cc8dd84c102f4c8fe931f2 100644
--- a/Tests/testStatsTree.cpp
+++ b/Tests/testStatsTree.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 
@@ -259,4 +259,4 @@ int main(int argc, char ** argv){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/Tests/testTreeIO.cpp b/Tests/testTreeIO.cpp
index c6901b1f586be2b41598177bd165f8d8f9f8e0b7..0dd57b30492bc1d3d8334b5e5821a0d3bc830d6d 100644
--- a/Tests/testTreeIO.cpp
+++ b/Tests/testTreeIO.cpp
@@ -1,4 +1,4 @@
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 
@@ -91,4 +91,4 @@ int main(int argc, char ** argv){
 }
 
 
-// [--LICENSE--]
+// [--END--]
diff --git a/UTests/FUTester.hpp b/UTests/FUTester.hpp
index 4f3b2b1adf3ede358811892f567c833608de2ed9..25dc53bbc27e4145a48a2049393cf2aaeea4ca6a 100644
--- a/UTests/FUTester.hpp
+++ b/UTests/FUTester.hpp
@@ -1,6 +1,6 @@
 #ifndef UTESTER_HPP
 #define UTESTER_HPP
-// /!\ Please, you must read the license at the bottom of this page
+// [--License--]
 
 #include <iostream>
 #include <list>