Fix some bug and relink Makefile
Merge pull request #2 from QuentinPerez/fixMakefile

Fix some bug and relink Makefile