Merge pull request #9 from philburk/fix-makefile