Updated Makefile
Updated build system