test zc

haha
Merge pull request #2 from Zhangcong/master

pull zc1