Merge pull request #120 from b3log/master

rebase
Merge pull request #124 from b3log/1.1.0

Merge pull request #120 from b3log/master