Rewrite of Makefile to be more user friendly
Update CHANGELOG.md
Merge pull request #22 from drybjed/makefile

Updated Makefile