new Makefile from Massimo