add zhangjin
xxx
Merge pull request #2 from pinguo-zhangjin/master

xxoo