makefile fixes
Merge pull request #11 from jsrain/master

makefile fixes