Minor fixes
Grunt tasks added