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

modiry 2