Merge pull request #103 from b3log/master

rebase
Fix #104
Merge pull request #112 from b3log/1.1.0

1.1.0