pulled makefile fix from master