pulled in master branch's Makefile