Merge pull request #188 from dcrosta/makefile-hack