Update Makefile

manually merging changes