modify 3
modify 4
Merge pull request #4 from pinguo-zhangjin/master

modify 3