Merge previous code & edit Gruntfile