Updated makefile and package.json