Merge pull request #6 from huangbolun/zhijiao_branch

Merge pull request #5 from huangbolun/master