Merge pull request #2 from charmyin/master

fengzhuntest
Merge pull request #4 from yinchangming/master

fengzhun