diff --git a/.gitignore b/.gitignore
index ea759e4532452943162615c77ad455672dafa904..0e1d1bd563638cee3fd5a57717884625b9a1cabb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@ _build/
 *.native
 *.byte
 *.rif
+*~
+#*
 
 log
 myocamlbuild.ml
@@ -21,4 +23,5 @@ linux
 linux64/
 *.cmt
 Makefile.local
+Makefile.version
 bin/
diff --git a/doc/version.tex b/doc/version.tex
index ca9b1b5eee99524dfda036d55d77ba69457cba73..633133a8f49d178bc58b9d8922af77cb6313fbd5 100644
--- a/doc/version.tex
+++ b/doc/version.tex
@@ -1,4 +1,4 @@
-\newcommand{\version}{1.20}
-\newcommand{\sha}{06600af}
+\newcommand{\version}{1.21}
+\newcommand{\sha}{fb28a81}
 \newcommand{\versionname}{none}
-\newcommand{\versiondate}{07-12-17}
+\newcommand{\versiondate}{08-12-17}
diff --git a/setup.ml b/setup.ml
index 50f9e5e01cd499621e48f4427bea89c2c3f0c836..7925d3f638fd19baed127ac0ff5ec375a3ad716e 100644
--- a/setup.ml
+++ b/setup.ml
@@ -1,4 +1,4 @@
-(* setup.ml generated for the first time by OASIS v0.4.5 *)
+(* setup.ml generated for the first time by OASIS v0.4.10 *)
 
 (* OASIS_START *)
 (* DO NOT EDIT (digest: 9b558962553bf4cacdb94a84135503ac) *)
diff --git a/src/lutilsVersion.ml b/src/lutilsVersion.ml
index 397aba06860edb927eb1cc35b13f7cddaf93b8ae..fa3d89235ae3055b3857ebd15c02596b1ee31910 100644
--- a/src/lutilsVersion.ml
+++ b/src/lutilsVersion.ml
@@ -1,2 +1,2 @@
-let str="1.20"
-let sha="06600af"
+let str="1.21"
+let sha="fb28a81"
diff --git a/test/Makefile b/test/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..6efa7852244fb815be440a315482a5023a67e075
--- /dev/null
+++ b/test/Makefile
@@ -0,0 +1,44 @@
+GNUPLOTRIF=./gnuplot-rif
+
+pdf:
+	$(GNUPLOTRIF) ControleurPorte.rif -pdf
+	$(GNUPLOTRIF) heater_float.rif -pdf
+
+ps:
+	$(GNUPLOTRIF) ControleurPorte.rif -ps
+	$(GNUPLOTRIF) heater_float.rif -ps
+
+cps:
+	$(GNUPLOTRIF) ControleurPorte.rif -cps
+	$(GNUPLOTRIF) heater_float.rif -cps
+
+
+eps:
+	$(GNUPLOTRIF) ControleurPorte.rif -eps
+	$(GNUPLOTRIF) heater_float.rif -eps
+
+jpg:
+	$(GNUPLOTRIF) ControleurPorte.rif -jpg
+	$(GNUPLOTRIF) heater_float.rif -jpg
+
+tex:
+	$(GNUPLOTRIF) ControleurPorte.rif -latex
+	$(GNUPLOTRIF) heater_float.rif -latex
+
+
+
+test-batch: pdf ps cps eps jpg tex
+	ls
+	sleep 1
+	make clean
+	echo " ==> Test went fine!"
+
+test: pdf ps cps eps jpg tex
+	sleep 1
+	xpdf ControleurPorte.pdf
+	xpdf heater_float.pdf
+	geeqie
+	make clean
+
+clean:
+	rm -f *.log *.p* *.gp *.tex *.eps *.jpg