@mikedewar is forcing me to commit this
Merge pull request #157 from nikhan/makefile

@mikedewar is forcing me to commit this