diff --git a/src/parser/PajeParser/PajeFileManager.hpp b/src/parser/PajeParser/PajeFileManager.hpp
index fa1df6de584143bdfc68c0709dd19d1f0c544573..b715db571ac7294986bdf59cf189f76a65a7bed5 100644
--- a/src/parser/PajeParser/PajeFileManager.hpp
+++ b/src/parser/PajeParser/PajeFileManager.hpp
@@ -1,45 +1,45 @@
 /*
-** This file is part of the ViTE project.
-**
-** This software is governed by the CeCILL-A license under French law
-** and abiding by the rules of distribution of free software. You can
-** use, modify and/or redistribute the software under the terms of the
-** CeCILL-A license as circulated by CEA, CNRS and INRIA at the following
-** URL: "http://www.cecill.info".
-**
-** As a counterpart to the access to the source code and rights to copy,
-** modify and redistribute granted by the license, users are provided
-** only with a limited warranty and the software's author, the holder of
-** the economic rights, and the successive licensors have only limited
-** liability.
-**
-** In this respect, the user's attention is drawn to the risks associated
-** with loading, using, modifying and/or developing or reproducing the
-** software by the user in light of its specific status of free software,
-** that may mean that it is complicated to manipulate, and that also
-** therefore means that it is reserved for developers and experienced
-** professionals having in-depth computer knowledge. Users are therefore
-** encouraged to load and test the software's suitability as regards
-** their requirements in conditions enabling the security of their
-** systems and/or data to be ensured and, more generally, to use and
-** operate it in the same conditions as regards security.
-**
-** The fact that you are presently reading this means that you have had
-** knowledge of the CeCILL-A license and that you accept its terms.
-**
-**
-** ViTE developers are (for version 0.* to 1.0):
-**
-**        - COULOMB Kevin
-**        - FAVERGE Mathieu
-**        - JAZEIX Johnny
-**        - LAGRASSE Olivier
-**        - MARCOUEILLE Jule
-**        - NOISETTE Pascal
-**        - REDONDY Arthur
-**        - VUCHENER Clément
-**
-*/
+ ** This file is part of the ViTE project.
+ **
+ ** This software is governed by the CeCILL-A license under French law
+ ** and abiding by the rules of distribution of free software. You can
+ ** use, modify and/or redistribute the software under the terms of the
+ ** CeCILL-A license as circulated by CEA, CNRS and INRIA at the following
+ ** URL: "http://www.cecill.info".
+ **
+ ** As a counterpart to the access to the source code and rights to copy,
+ ** modify and redistribute granted by the license, users are provided
+ ** only with a limited warranty and the software's author, the holder of
+ ** the economic rights, and the successive licensors have only limited
+ ** liability.
+ **
+ ** In this respect, the user's attention is drawn to the risks associated
+ ** with loading, using, modifying and/or developing or reproducing the
+ ** software by the user in light of its specific status of free software,
+ ** that may mean that it is complicated to manipulate, and that also
+ ** therefore means that it is reserved for developers and experienced
+ ** professionals having in-depth computer knowledge. Users are therefore
+ ** encouraged to load and test the software's suitability as regards
+ ** their requirements in conditions enabling the security of their
+ ** systems and/or data to be ensured and, more generally, to use and
+ ** operate it in the same conditions as regards security.
+ **
+ ** The fact that you are presently reading this means that you have had
+ ** knowledge of the CeCILL-A license and that you accept its terms.
+ **
+ **
+ ** ViTE developers are (for version 0.* to 1.0):
+ **
+ **        - COULOMB Kevin
+ **        - FAVERGE Mathieu
+ **        - JAZEIX Johnny
+ **        - LAGRASSE Olivier
+ **        - MARCOUEILLE Jule
+ **        - NOISETTE Pascal
+ **        - REDONDY Arthur
+ **        - VUCHENER Clément
+ **
+ */
 
 /**
  * \file    PajeFileManager.hpp
@@ -67,7 +67,7 @@
 
 #include <string.h>
 
-#define _PAJE_NBMAXTKS  16
+#define _PAJE_NBMAXTKS  32
 
 /**
  * \struct PajeLine
diff --git a/src/parser/PajeParser/mt_PajeFileManager.hpp b/src/parser/PajeParser/mt_PajeFileManager.hpp
index 2deb2b2c46abb51ab4c6966e1156ff327e4122bb..4510738ad3d596b3f9a7b536ac92f32644af4a13 100644
--- a/src/parser/PajeParser/mt_PajeFileManager.hpp
+++ b/src/parser/PajeParser/mt_PajeFileManager.hpp
@@ -1,49 +1,49 @@
 /*
-** This file is part of the ViTE project.
-**
-** This software is governed by the CeCILL-A license under French law
-** and abiding by the rules of distribution of free software. You can
-** use, modify and/or redistribute the software under the terms of the
-** CeCILL-A license as circulated by CEA, CNRS and INRIA at the following
-** URL: "http://www.cecill.info".
-** 
-** As a counterpart to the access to the source code and rights to copy,
-** modify and redistribute granted by the license, users are provided
-** only with a limited warranty and the software's author, the holder of
-** the economic rights, and the successive licensors have only limited
-** liability.
-** 
-** In this respect, the user's attention is drawn to the risks associated
-** with loading, using, modifying and/or developing or reproducing the
-** software by the user in light of its specific status of free software,
-** that may mean that it is complicated to manipulate, and that also
-** therefore means that it is reserved for developers and experienced
-** professionals having in-depth computer knowledge. Users are therefore
-** encouraged to load and test the software's suitability as regards
-** their requirements in conditions enabling the security of their
-** systems and/or data to be ensured and, more generally, to use and
-** operate it in the same conditions as regards security.
-** 
-** The fact that you are presently reading this means that you have had
-** knowledge of the CeCILL-A license and that you accept its terms.
-**
-**
-** ViTE developers are (for version 0.* to 1.0):
-**
-**        - COULOMB Kevin
-**        - FAVERGE Mathieu
-**        - JAZEIX Johnny
-**        - LAGRASSE Olivier
-**        - MARCOUEILLE Jule
-**        - NOISETTE Pascal
-**        - REDONDY Arthur
-**        - VUCHENER Clément 
-**
-*/
-  
+ ** This file is part of the ViTE project.
+ **
+ ** This software is governed by the CeCILL-A license under French law
+ ** and abiding by the rules of distribution of free software. You can
+ ** use, modify and/or redistribute the software under the terms of the
+ ** CeCILL-A license as circulated by CEA, CNRS and INRIA at the following
+ ** URL: "http://www.cecill.info".
+ **
+ ** As a counterpart to the access to the source code and rights to copy,
+ ** modify and redistribute granted by the license, users are provided
+ ** only with a limited warranty and the software's author, the holder of
+ ** the economic rights, and the successive licensors have only limited
+ ** liability.
+ **
+ ** In this respect, the user's attention is drawn to the risks associated
+ ** with loading, using, modifying and/or developing or reproducing the
+ ** software by the user in light of its specific status of free software,
+ ** that may mean that it is complicated to manipulate, and that also
+ ** therefore means that it is reserved for developers and experienced
+ ** professionals having in-depth computer knowledge. Users are therefore
+ ** encouraged to load and test the software's suitability as regards
+ ** their requirements in conditions enabling the security of their
+ ** systems and/or data to be ensured and, more generally, to use and
+ ** operate it in the same conditions as regards security.
+ **
+ ** The fact that you are presently reading this means that you have had
+ ** knowledge of the CeCILL-A license and that you accept its terms.
+ **
+ **
+ ** ViTE developers are (for version 0.* to 1.0):
+ **
+ **        - COULOMB Kevin
+ **        - FAVERGE Mathieu
+ **        - JAZEIX Johnny
+ **        - LAGRASSE Olivier
+ **        - MARCOUEILLE Jule
+ **        - NOISETTE Pascal
+ **        - REDONDY Arthur
+ **        - VUCHENER Clément
+ **
+ */
+
 /**
  * \file    mt_PajeFileManager.hpp
- *  Visual Trace Explorer 
+ *  Visual Trace Explorer
  *
  *  Release Date: January, 2nd 2010
  *  ViTE is a software to vivisualize execution trace provided by
@@ -57,24 +57,24 @@
  * @author  Jule Marcoueille
  * @author  Pascal Noisette
  * @author  Arthur Redondy
- * @author  Clément Vuchener 
+ * @author  Clément Vuchener
  * @date    2010-01-02
  *
  **/
-  
+
 #ifndef FILE_HPP
 #define FILE_HPP
- 
+
 #include <string.h>
 #ifdef WIN32
 #include <windows.h>
 #else
-#include <unistd.h> 
+#include <unistd.h>
 #include <sys/mman.h>
 #endif
 #include <stdio.h>
 #include <fcntl.h>
-#define _PAJE_NBMAXTKS  16
+#define _PAJE_NBMAXTKS  32
 
 #include <cstring>
 #include <string>
@@ -83,31 +83,31 @@
 #include <QMetaType>
 using namespace std;
 /**
- * \struct PajeLine 
+ * \struct PajeLine
  *
- * Brief structure to store informations read 
+ * Brief structure to store informations read
  * on each line
  *
  * \param _id Line number
  * \param _nbtks Number of tokens found on the line
  * \param _tokens Pointers on the found tokens
- * 
+ *
  */
 typedef struct PajeLine {
     int    _id;
     int    _nbtks;
     char **_tokens;
-    
+
 } PajeLine_t;
 //Q_DECLARE_METATYPE(PajeLine);
 
 /**
  *  \class mt_PajeFileManager
- *  
+ *
  *  File manager to read files using Paje syntax.
- *  Each line is read one after one and stored in 
+ *  Each line is read one after one and stored in
  *  the PajeLine structure associated to the class.
- * 
+ *
  * \sa Parser
  * \sa ParserPaje
  * \sa ParserVite
@@ -116,7 +116,7 @@ class mt_PajeFileManager : public std::ifstream {
 
 private:
     std::string           _filename;
-	unsigned long long    _filesize;
+    unsigned long long    _filesize;
     int                   _total_filesize;
     int                   _nbchunks;
     int                   _current_chunk;
@@ -130,36 +130,36 @@ private:
     char*                 _old_line;
 
 #ifdef WIN32
-	HANDLE _fd;
-	HANDLE _fm;
-	
+    HANDLE _fd;
+    HANDLE _fm;
+
 #else
     FILE* _fd;
 #endif
-	unsigned long long					_pageSize;
-	unsigned long long                   _offset;
-	unsigned long long                   _global_offset;
+    unsigned long long					_pageSize;
+    unsigned long long                   _offset;
+    unsigned long long                   _global_offset;
 
     mt_PajeFileManager(const mt_PajeFileManager &);
-    
+
 public:
     /*!
      *  \brief Constructor for the file
      */
     mt_PajeFileManager();
-    
+
     /*!
      *  \brief  Constructor for the file
      *  \param  filename : a filename
      */
     mt_PajeFileManager(const char * filename);
-      
+
     /*!
      *  \brief Destructor
      *  Destroy the file
      */
     ~mt_PajeFileManager();
-        
+
     /*!
      *  \fn open(const char * filename, ios_base::openmode mode)
      *  \brief Open the file
@@ -174,19 +174,19 @@ public:
      */
     void close();
 
-	/*!
+    /*!
      *  \fn eof()
      *  \brief check the end of file
      */
     bool eof();
 
-	/*!
+    /*!
      *  \fn eoc()
      *  \brief check the end of the opened chunk of file
      */
     bool eoc();
 
-	/*!
+    /*!
      *  \fn close_old_chunk()
      *  \brief release the previous chunk of file
      */
@@ -203,7 +203,7 @@ public:
      *  \return The size already loaded
      */
     int get_size_loaded();
-    
+
     /*!
      *  \fn get_percent_loaded()
      *  \return The percent of the file loaded (between 0 and 1).