Merge pull request #1 from layman00/master

gggg
Merge pull request #3 from xianjiuling/master

Merge pull request #1 from layman00/master