Merge pull request #115 from b3log/master

rebase
.
.
Merge pull request #116 from b3log/1.1.0

1.1.0