diff --git a/Makefile b/Makefile
index 0cedb91..092ef9b 100644
--- a/Makefile
+++ b/Makefile
@@ -221,11 +221,10 @@ build: .encadrer .versionFile $(OUTPUT_NAME)
 	@echo '
           DEBUT DE COMPILATION DU PROGRAMME :'$(CADRE_COTERS)
 	@echo '
             Repertoire Sources : $(FILE_DIRECTORY)/'$(CADRE_COTERS)
 	@echo '
             Repertoire object  : $(OBJECT_DIRECTORY)/'$(CADRE_COTERS)
-	@echo '
             Binaire de sortie  : $(F_VIOLET)$(OUTPUT_NAME) / $(OUTPUT_NAME)-stripped$(F_NORMALE)'$(CADRE_COTERS)
+	@echo '
             Binaire de sortie  : $(F_VIOLET)$(OUTPUT_NAME) $(F_NORMALE)'$(CADRE_COTERS)
 	@echo $(CADRE_COTERS)
 	@echo $(CADRE_HAUT_BAS)
 	@mkdir -p $(addprefix $(OBJECT_DIRECTORY)/, $(LISTE_MODULES))
-	@mkdir -p ~/.bin
 
 
 FILE_IMAGES=	data/imagesSources/*.png
diff --git a/Sources/Highlight/Highlight.cpp b/Sources/Highlight/Highlight.cpp
index e5cbc23..4686899 100644
--- a/Sources/Highlight/Highlight.cpp
+++ b/Sources/Highlight/Highlight.cpp
@@ -276,7 +276,7 @@ void Highlight::Parse2(int32_t start,
 				//EDN_INFO("Find Pattern in the Buffer : (" << resultat.beginStart << "," << resultat.endStop << ")" );
 				// Add curent element in the list ...
 				metaData.PushBack(resultat);
-				elementStart = resultat.endStop;
+				elementStart = resultat.endStop-1;
 				// Exit current cycle
 				break;
 			}
diff --git a/Sources/Highlight/HighlightManager.cpp b/Sources/Highlight/HighlightManager.cpp
index cfe4b50..02c3d6a 100644
--- a/Sources/Highlight/HighlightManager.cpp
+++ b/Sources/Highlight/HighlightManager.cpp
@@ -114,6 +114,11 @@ void HighlightManager::loadLanguages(void)
 	myHightline = new Highlight(xmlFilename);
 	listHighlight.PushBack(myHightline);
 	
+	xmlFilename = homedir;
+	xmlFilename += "lang_matlab.xml";
+	myHightline = new Highlight(xmlFilename);
+	listHighlight.PushBack(myHightline);
+	
 	//myHightline->Display();
 }
 
diff --git a/avancement.boo b/avancement.boo
index 534ddb1..a747a19 100644
--- a/avancement.boo
+++ b/avancement.boo
@@ -17,7 +17,6 @@
 # action a faire (ordonner par révision) :
 	* 0.1.X :
 		- ctags : Back simple et multiple
-		- ctags : Multiple files
 		- sys : search complet, replace complet and replace ALL ...
 		- gui : demander l'enregistrement avant de fermer (quand c'est nécessaire)
 		- Faire les deplacement de EdnXXX dans le nameSpace Edn::XXX
diff --git a/data/lang_Makefile.xml b/data/lang_Makefile.xml
index 3ff0c9e..dbe37db 100644
--- a/data/lang_Makefile.xml
+++ b/data/lang_Makefile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EdnLang version="0.1" lang="c">
+<EdnLang version="0.1" lang="Makefiles">
 	<ext>Makefile</ext>
 	<ext>*.mk</ext>
 	<ext>*.global</ext>
diff --git a/data/lang_bash.xml b/data/lang_bash.xml
index 0805cea..52e817b 100644
--- a/data/lang_bash.xml
+++ b/data/lang_bash.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EdnLang version="0.1" lang="c">
+<EdnLang version="0.1" lang="Bash script">
 	<ext>*.sh</ext>
 	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
 		<rule name="first line">
diff --git a/data/lang_boo.xml b/data/lang_boo.xml
index 95de820..820c441 100644
--- a/data/lang_boo.xml
+++ b/data/lang_boo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EdnLang version="0.1" lang="c">
+<EdnLang version="0.1" lang="boulou log">
 	<ext>*.boo</ext>
 	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
 		<rule name="comment ##">
diff --git a/data/lang_matlab.xml b/data/lang_matlab.xml
new file mode 100644
index 0000000..587370b
--- /dev/null
+++ b/data/lang_matlab.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EdnLang version="0.1" lang="matlab">
+	<ext>*.m</ext>
+	<ext>*.M</ext>
+	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
+		<rule name="my comment doxygen">
+			<color>commentDoxygen</color>
+			<start>%%</start>
+			<end>\n</end>
+		</rule>
+		<rule name="my comment">
+			<color>comment</color>
+			<start>%</start>
+			<end>\n</end>
+			<EscapeChar>\</EscapeChar>
+		</rule>
+		<rule name="doubleQuteText">
+			<color>doubleQuoteText</color>
+			<start> "</start>
+			<end>("|\n)</end>
+			<EscapeChar>\</EscapeChar>
+		</rule>
+		<rule name="simpleQuteText">
+			<color>doubleQuoteText</color>
+			<start> '</start>
+			<end>('|\n)</end>
+			<!--<EscapeChar>\</EscapeChar>-->
+		</rule>
+		<rule name="global inclusion">
+			<color>preprocesseur</color>
+			<start>global </start>
+			<end>\n</end>
+			<EscapeChar>\</EscapeChar>
+		</rule>
+	</pass1>
+	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
+		<rule name="my keyword">
+			<color>keyword</color>
+			<start>\@return|goto|if|else|case|default|switch|break|continue|while|do|for|otherwise|end\@</start>
+		</rule>
+		<rule name="my boolean">
+			<color>boolean</color>
+			<start>\@true|false\@</start>
+		</rule>
+		<rule name="Function name">
+			<color>functionName</color>
+			<start>\@(\w|_)+[ \t]*\(</start>
+		</rule>
+		<rule name="condition">
+			<color>boolean</color>
+			<start>==|&lt;=|&gt;=|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}|</start>
+		</rule>
+		<rule name="numeric constant">
+			<color>number</color>
+			<start>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</start>
+		</rule>
+		<rule name="BIG LETTER">
+			<color>macro</color>
+			<start>\@[A-Z_][A-Z_0-9]{3,500}\@</start>
+		</rule>
+	</pass2>
+</EdnLang>
diff --git a/data/lang_php.xml b/data/lang_php.xml
index 1d5acbe..393169f 100644
--- a/data/lang_php.xml
+++ b/data/lang_php.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EdnLang version="0.1" lang="c">
+<EdnLang version="0.1" lang="php: pretty home page">
 	<ext>*.php</ext>
 	<ext>*.php3</ext>
 	<ext>*.php4</ext>
diff --git a/data/lang_xml.xml b/data/lang_xml.xml
index 1e17929..9bb18cc 100644
--- a/data/lang_xml.xml
+++ b/data/lang_xml.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EdnLang version="0.1" lang="Assembleur">
+<EdnLang version="0.1" lang="XML">
 	<ext>*.xml</ext>
 	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
 		<rule name="Comment">