Some changes adapted in Gruntfile.js