merge Makefile from master