Makefile modifications to improve build process
Merge pull request #12 from dlintott/master

Makefile modifications to improve build process