SQUASH ME: updated Makefile to current master