Merged makefile from master.