diff --git a/Makefile b/Makefile
index e0367ff595bde24c8affe3f8dd8131273146a49a..095e39195078052e2dcbc332f712866454d27087 100755
--- a/Makefile
+++ b/Makefile
@@ -178,7 +178,7 @@ stdrelease:
 	cp  $(TTOOL_SIMULATORS)/c++2/src_simulator/evt/*.h $(TTOOL_TARGET)/simulators/c++2/src_simulator/evt
 	cp  $(TTOOL_SIMULATORS)/c++2/src_simulator/sim/*.cpp $(TTOOL_TARGET)/simulators/c++2/src_simulator/sim
 	cp  $(TTOOL_SIMULATORS)/c++2/src_simulator/sim/*.h $(TTOOL_TARGET)/simulators/c++2/src_simulator/sim
-#	cp  $(TTOOL_SIMULATORS)/c++2/src_simulator/TEPE/*.cpp $(TTOOL_TARGET)/simulators/c++2/src_simulator/TEPE
+	cp  $(TTOOL_SIMULATORS)/c++2/src_simulator/TEPE/*.cpp $(TTOOL_TARGET)/simulators/c++2/src_simulator/TEPE
 	cp  $(TTOOL_SIMULATORS)/c++2/src_simulator/TEPE/*.h $(TTOOL_TARGET)/simulators/c++2/src_simulator/TEPE
 # Licenses
 	cd $(TTOOL_DOC); cp $(RELEASE_STD_FILES_LICENSES) $(TTOOL_TARGET)
@@ -221,8 +221,7 @@ stdrelease:
 	cp $(TTOOL_DOC)/README_bin $(TTOOL_TARGET)/bin
 	cp $(TTOOL_BIN)/configuration.gcf $(TTOOL_TARGET)/bin
 	cp -R $(TTOOL_BIN)/$(TTOOL_LOTOS_H).h $(TTOOL_BIN)/$(TTOOL_LOTOS_H)_?.h $(TTOOL_BIN)/$(TTOOL_LOTOS_H)_?.t  $(TTOOL_BIN)/$(TTOOL_LOTOS_H)_?.f $(TTOOL_TARGET)/bin
-	cp $(TTOOL_BIN)/$(TTOOL_BINARY) $(TTOOL_BIN)/$(LAUNCHER_BINARY) $(TTOOL_BIN)/$(TIFTRANSLATOR_BINARY) $(TTOOL_BIN)/$(TMLTRANSLATOR_BINARY) $(TTOOL_BIN)/$(RUNDSE_BINARY) $(TTOOL_BIN)/$(TTOOL_CONFIG_SRC) $(TTOOL_TARGET)/bin
-	
+	cp $(TTOOL_BIN)/$(TTOOL_BINARY) $(TTOOL_BIN)/$(LAUNCHER_BINARY) $(TTOOL_BIN)/$(TIFTRANSLATOR_BINARY) $(TTOOL_BIN)/$(TMLTRANSLATOR_BINARY) $(TTOOL_BIN)/$(RUNDSE_BINARY) $(TTOOL_BIN)/$(TTOOL_CONFIG_SRC) $(TTOOL_TARGET)/bin	
 
 # Basic release
 	cd $(TTOOL_TARGET_RELEASE);$(TAR) cfv $(TTOOL_STD_RELEASE)/release.tar *; $(GZIP) -9 $(TTOOL_STD_RELEASE)/release.tar; mv $(TTOOL_STD_RELEASE)/release.tar.gz $(TTOOL_STD_RELEASE)/release.tgz
diff --git a/src/tmltranslator/TMLModeling.java b/src/tmltranslator/TMLModeling.java
index 830332ee66642a44651cc4b12ee0021358d80901..30f11f45ce0f73cc0ecbc0b2cbef53258b428023 100755
--- a/src/tmltranslator/TMLModeling.java
+++ b/src/tmltranslator/TMLModeling.java
@@ -283,8 +283,10 @@ public class TMLModeling {
         ListIterator iterator = requests.listIterator();
         while(iterator.hasNext()) {
             request = (TMLRequest)(iterator.next());
-            if (request.getName().compareTo(_request.getName()) == 0) {
-                return true;
+            if (request != _request) {
+            	if (request.getName().compareTo(_request.getName()) == 0) {
+            		return true;
+            	}
             }
         } 
         return false;
@@ -303,6 +305,8 @@ public class TMLModeling {
         return null;
     }
     
+    
+    // Returns a similar request if found
     public TMLRequest hasSimilarRequest(TMLRequest _request) {
         TMLRequest request;
         int i;
@@ -314,19 +318,19 @@ public class TMLModeling {
             if (request.getName().compareTo(_request.getName()) == 0) {
                 // must verify whether a param is different or not.
                 if (request.getNbOfParams() != _request.getNbOfParams()) {
-					TraceManager.addDev("nb of params");
+					TraceManager.addDev(" *** -> nb of params is different");
                     return null;
                 }
                 
                 for(i=0; i<request.getNbOfParams(); i++) {
                     if (request.getType(i).getType() != _request.getType(i).getType()) {
-						TraceManager.addDev("Params #" + i + " type");
+						TraceManager.addDev("**** -> Params #" + i + " type");
                         return null;
                     }
                 }
                 
                 if (request.getDestinationTask() != _request.getDestinationTask()) {
-					TraceManager.addDev("Destination task");
+					TraceManager.addDev("**** ->Destination task: found=" + request.getDestinationTask().getName() + " provided=" + _request.getDestinationTask().getName());
                     return null;
                 }
 				
diff --git a/src/ui/DefaultText.java b/src/ui/DefaultText.java
index 5399a4595603a99d2f4f166845b2a1899b4273ee..601e5d1e2bb5230915461b17df259e91ea6e9077 100755
--- a/src/ui/DefaultText.java
+++ b/src/ui/DefaultText.java
@@ -60,7 +60,7 @@ public class DefaultText  {
     }
     
     public static String getVersion() {
-        return "0.93"; /* Set new release Dec. 6th, 2012 */
+        return "0.94-beta1"; /* Set new release Dec. 21th, 2012 */
     }
 	
 	public static String getFullVersion() {
diff --git a/src/ui/GTMLModeling.java b/src/ui/GTMLModeling.java
index eaa230961a6be3e1e927f05b7c930642aeb4beeb..3656cf20a90496d350c5ae6cde7cf27d3a795b04 100755
--- a/src/ui/GTMLModeling.java
+++ b/src/ui/GTMLModeling.java
@@ -543,7 +543,7 @@ public class GTMLModeling  {
 					
 					// More: test the compatibility of the request!
 					if (request.getDestinationTask() != tmlm.getTMLTaskByName(makeName((TGComponent)t2, t2.getTaskName()))) {
-						String msg = "request " + tmlro.getRequestName() + " is declared several times differently";
+						String msg = "request " + tmlro.getRequestName() + " is declared several times differently (compatibility issue)";
 						CheckingError ce = new CheckingError(CheckingError.STRUCTURE_ERROR, msg);
 						ce.setTDiagramPanel(tmldp.tmltdp);
 						ce.setTGComponent(tgc);