Fixed Makefile
Updated build process