Merge pull request #1 from ahfergus1/master

Makefile please?
Merge pull request #9 from bobAtk/master

Makefile update