Added Grunt and small code changes