Grunt plugin revised