Updated Makefile to use new options