reduce merge pain of Makefile
Merge pull request #18 from ashleyh/master

reduce merge pain of Makefile