Polish codestyle
Update Gruntfile.js
Merge pull request #19 from ivanzhaowy/master

Merge