diff --git a/Modules/Marcel/Makefile b/Modules/Marcel/Makefile
index cf67db6..6be5b6b 100644
--- a/Modules/Marcel/Makefile
+++ b/Modules/Marcel/Makefile
@@ -6,7 +6,7 @@ gotoall: all
 
 #The compiler (may be customized for compiler's options).
 cc=cc
-opts=-Wall -O2 -fPIC -DDEBUG -DMCHECK="mcheck(NULL)" $(shell pkg-config --libs lua ) $(shell pkg-config --libs json-c ) -lcurl 	-DPLUGIN_DIR='"/home/laurent/Projets/Marcel"' -L/home/laurent/Projets/Marcel 	-L/home/laurent/Projets/Marcel -lpaho-mqtt3c -lm -ldl -Wl,--export-dynamic -lpthread 	
+opts=-Wall -O2 -fPIC   $(shell pkg-config --libs lua ) $(shell pkg-config --libs json-c ) -lcurl 	-DPLUGIN_DIR='"/usr/local/lib/Marcel"' -L/usr/local/lib/Marcel 	-L/home/laurent/Projets/Marcel -lpaho-mqtt3c -lm -ldl -Wl,--export-dynamic -lpthread 	
 
 CURL_helpers.o : CURL_helpers.c CURL_helpers.h Marcel.h Makefile 
 	$(cc) -c -o CURL_helpers.o CURL_helpers.c $(opts) 
diff --git a/Modules/mod_1wire/Makefile b/Modules/mod_1wire/Makefile
index 6e06ed3..6645b14 100644
--- a/Modules/mod_1wire/Makefile
+++ b/Modules/mod_1wire/Makefile
@@ -6,7 +6,7 @@ gotoall: all
 
 #The compiler (may be customized for compiler's options).
 cc=cc
-opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA -DDEBUG -DMCHECK="mcheck(NULL)"
+opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA  
 
 1WAlarm.o : 1WAlarm.c mod_1wire.h ../Marcel/Module.h \
   ../Marcel/Section.h ../mod_Lua/mod_Lua.h ../Marcel/MQTT_tools.h \
diff --git a/Modules/mod_Lua/Makefile b/Modules/mod_Lua/Makefile
index 09fa5ee..5b0011d 100644
--- a/Modules/mod_Lua/Makefile
+++ b/Modules/mod_Lua/Makefile
@@ -6,7 +6,7 @@ gotoall: all
 
 #The compiler (may be customized for compiler's options).
 cc=cc
-opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA -DDEBUG -DMCHECK="mcheck(NULL)" $(shell pkg-config --libs lua )
+opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA   $(shell pkg-config --libs lua )
 
 exposedFunction.o : exposedFunction.c mod_Lua.h ../Marcel/Module.h \
   ../Marcel/Section.h ../Marcel/Version.h ../Marcel/MQTT_tools.h \
diff --git a/Modules/mod_OnOff/Makefile b/Modules/mod_OnOff/Makefile
index ad0049e..9fb2e57 100644
--- a/Modules/mod_OnOff/Makefile
+++ b/Modules/mod_OnOff/Makefile
@@ -6,7 +6,7 @@ gotoall: all
 
 #The compiler (may be customized for compiler's options).
 cc=cc
-opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA -DDEBUG -DMCHECK="mcheck(NULL)"
+opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA  
 
 mod_OnOff.o : mod_OnOff.c mod_OnOff.h ../Marcel/Module.h \
   ../Marcel/Section.h ../mod_alert/mod_alert.h ../Marcel/DList.h \
diff --git a/Modules/mod_OpenWeatherMap/Makefile b/Modules/mod_OpenWeatherMap/Makefile
index fe77fc8..0b109d9 100644
--- a/Modules/mod_OpenWeatherMap/Makefile
+++ b/Modules/mod_OpenWeatherMap/Makefile
@@ -6,7 +6,7 @@ gotoall: all
 
 #The compiler (may be customized for compiler's options).
 cc=cc
-opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA $(shell pkg-config --cflags json-c ) -DDEBUG -DMCHECK="mcheck(NULL)"
+opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA $(shell pkg-config --cflags json-c )  
 
 Weather3H.o : Weather3H.c mod_owm.h ../Marcel/Module.h \
   ../Marcel/Section.h ../Marcel/MQTT_tools.h ../Marcel/Version.h \
diff --git a/Modules/mod_RFXtrx/Makefile b/Modules/mod_RFXtrx/Makefile
index 1441489..5900b69 100644
--- a/Modules/mod_RFXtrx/Makefile
+++ b/Modules/mod_RFXtrx/Makefile
@@ -6,7 +6,7 @@ gotoall: all
 
 #The compiler (may be customized for compiler's options).
 cc=cc
-opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA -DDEBUG -DMCHECK="mcheck(NULL)"
+opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA  
 
 mod_RFXtrx.o : mod_RFXtrx.c mod_RFXtrx.h ../Marcel/Module.h \
   ../Marcel/Section.h ../mod_Lua/mod_Lua.h ../Marcel/MQTT_tools.h \
diff --git a/Modules/mod_alert/Makefile b/Modules/mod_alert/Makefile
index efe8de8..728e988 100644
--- a/Modules/mod_alert/Makefile
+++ b/Modules/mod_alert/Makefile
@@ -6,7 +6,7 @@ gotoall: all
 
 #The compiler (may be customized for compiler's options).
 cc=cc
-opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA -DDEBUG -DMCHECK="mcheck(NULL)"
+opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA  
 
 action.o : action.c mod_alert.h ../Marcel/Module.h ../Marcel/Section.h \
   ../Marcel/DList.h ../mod_Lua/mod_Lua.h Makefile 
diff --git a/Modules/mod_dpd/Makefile b/Modules/mod_dpd/Makefile
index 7c1fbb2..cad73b0 100644
--- a/Modules/mod_dpd/Makefile
+++ b/Modules/mod_dpd/Makefile
@@ -6,7 +6,7 @@ gotoall: all
 
 #The compiler (may be customized for compiler's options).
 cc=cc
-opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA -DDEBUG -DMCHECK="mcheck(NULL)"
+opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA  
 
 mod_dpd.o : mod_dpd.c mod_dpd.h ../Marcel/Module.h ../Marcel/Section.h \
   ../mod_Lua/mod_Lua.h ../Marcel/MQTT_tools.h Makefile 
diff --git a/Modules/mod_dummy/Makefile b/Modules/mod_dummy/Makefile
index 0264f05..27ba3ef 100644
--- a/Modules/mod_dummy/Makefile
+++ b/Modules/mod_dummy/Makefile
@@ -6,7 +6,7 @@ gotoall: all
 
 #The compiler (may be customized for compiler's options).
 cc=cc
-opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA -DDEBUG -DMCHECK="mcheck(NULL)"
+opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA  
 
 mod_dummy.o : mod_dummy.c mod_dummy.h ../Marcel/Module.h \
   ../Marcel/Section.h ../mod_Lua/mod_Lua.h Makefile 
diff --git a/Modules/mod_every/Makefile b/Modules/mod_every/Makefile
index 822c4ab..68c80cc 100644
--- a/Modules/mod_every/Makefile
+++ b/Modules/mod_every/Makefile
@@ -6,7 +6,7 @@ gotoall: all
 
 #The compiler (may be customized for compiler's options).
 cc=cc
-opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA -DDEBUG -DMCHECK="mcheck(NULL)"
+opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA  
 
 mod_every.o : mod_every.c mod_every.h ../Marcel/Module.h \
   ../Marcel/Section.h ../mod_Lua/mod_Lua.h Makefile 
diff --git a/Modules/mod_freeboxV5/Makefile b/Modules/mod_freeboxV5/Makefile
index e33929a..ae2bf59 100644
--- a/Modules/mod_freeboxV5/Makefile
+++ b/Modules/mod_freeboxV5/Makefile
@@ -6,7 +6,7 @@ gotoall: all
 
 #The compiler (may be customized for compiler's options).
 cc=cc
-opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA -DDEBUG -DMCHECK="mcheck(NULL)"
+opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA  
 
 mod_freeboxV5.o : mod_freeboxV5.c mod_freeboxV5.h ../Marcel/Module.h \
   ../Marcel/Section.h ../Marcel/MQTT_tools.h ../mod_Lua/mod_Lua.h \
diff --git a/Modules/mod_inotify/Makefile b/Modules/mod_inotify/Makefile
index 0a765d1..3e74bb1 100644
--- a/Modules/mod_inotify/Makefile
+++ b/Modules/mod_inotify/Makefile
@@ -6,7 +6,7 @@ gotoall: all
 
 #The compiler (may be customized for compiler's options).
 cc=cc
-opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA -DDEBUG -DMCHECK="mcheck(NULL)"
+opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA  
 
 mod_inotify.o : mod_inotify.c mod_inotify.h ../Marcel/Module.h \
   ../Marcel/Section.h ../Marcel/MQTT_tools.h ../mod_Lua/mod_Lua.h \
diff --git a/Modules/mod_outfile/Makefile b/Modules/mod_outfile/Makefile
index c6820de..8a44abf 100644
--- a/Modules/mod_outfile/Makefile
+++ b/Modules/mod_outfile/Makefile
@@ -6,7 +6,7 @@ gotoall: all
 
 #The compiler (may be customized for compiler's options).
 cc=cc
-opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA -DDEBUG -DMCHECK="mcheck(NULL)"
+opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA  
 
 mod_outfile.o : mod_outfile.c mod_outfile.h ../Marcel/Module.h \
   ../Marcel/Section.h ../Marcel/MQTT_tools.h ../mod_Lua/mod_Lua.h \
diff --git a/Modules/mod_sht31/Makefile b/Modules/mod_sht31/Makefile
index e5992ea..565ee8f 100644
--- a/Modules/mod_sht31/Makefile
+++ b/Modules/mod_sht31/Makefile
@@ -6,7 +6,7 @@ gotoall: all
 
 #The compiler (may be customized for compiler's options).
 cc=cc
-opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA -DDEBUG -DMCHECK="mcheck(NULL)"
+opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA  
 
 mod_sht31.o : mod_sht31.c mod_sht31.h ../Marcel/Module.h \
   ../Marcel/Section.h ../mod_Lua/mod_Lua.h ../Marcel/MQTT_tools.h \
diff --git a/Modules/mod_ups/Makefile b/Modules/mod_ups/Makefile
index 4f408b2..cfb0eda 100644
--- a/Modules/mod_ups/Makefile
+++ b/Modules/mod_ups/Makefile
@@ -6,7 +6,7 @@ gotoall: all
 
 #The compiler (may be customized for compiler's options).
 cc=cc
-opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA -DDEBUG -DMCHECK="mcheck(NULL)"
+opts=-Wall -O2 -fPIC $(shell pkg-config --cflags lua ) -DLUA  
 
 mod_ups.o : mod_ups.c mod_ups.h ../Marcel/Module.h ../Marcel/Section.h \
   ../Marcel/MQTT_tools.h ../mod_Lua/mod_Lua.h Makefile 
diff --git a/remake.sh b/remake.sh
index 53ca463..3455e29 100644
--- a/remake.sh
+++ b/remake.sh
@@ -61,18 +61,18 @@ BUILD_DUMMY=1
 ###
 
 # Enable debugging messages
-DEBUG=1
+#DEBUG=1
 
 # MCHECK - check memory concistency (see glibc's mcheck())
-MCHECK=1
+#MCHECK=1
 
 
 # Where to generate ".so" plugins
 # ---
 # production's target directory
-#PLUGIN_DIR=/usr/local/lib/Marcel
+PLUGIN_DIR=/usr/local/lib/Marcel
 # During development, being clean and keep everything in our own directory
-PLUGIN_DIR=$( pwd )
+#PLUGIN_DIR=$( pwd )
 
 # -------------------------------------
 #      END OF CONFIGURATION AREA