Added Makefile

Should work on Mac/Linux
Improved output formatting