Gruntfile.js upgraded (task seperated)