Added more options to the Makefile