Merge pull request #1 from hexojs/master

Merge