Add grunt
Some fix