Update Makefile and Gruntfile.js