New version, just to fix a stupid problem in the makefile