Changes on Makefile