Synch'd Makefile changes with master