cjl-dev #79

Closed
chenjiale wants to merge 3 commits from cjl-dev into master