Merge pull request #11 from russellfriesenhahn/fixup_makefile_merge Fixup for Makefile merge 9466e57ce8