Problem #13
Corrected Makefile
Merged #13 and correction to #12