Merge pull request #79 from b3log/1.1.0

Merge pull request #78 from b3log/master
.
Merge pull request #80 from b3log/master

1.0.0