Update Makefile
Update package.json