Merge pull request #14 from thewillhuang/hiroshi

Make Grunt pass.