Updated Makefile to be a little more robust.