Merge pull request #380 from negativeExponent/fix_makefile