[M] Refacto full grunt
[M] Update README
Merge pull request #8 from douglasduteil/refacto-more-grunt

Refacto more grunt