Updated Makefile with changes for 1.5