Update Makefile from master