Merge pull request #179 from kberg/makefile-fun