Fix #2
Using Grunt
Fix #5