Imporved makefile