Bug fixes

FIXED:
 - Bug that would prevent the Makefile from working correctly