Merge pull request #1 from b3log/master

merged with newer
#163
#163 !
Merge pull request #166 from xbreezes/master

Fix #165