Update makefile
Update package.json