del ##
Merge pull request #3 from xianjiuling/master

Merge pull request #1 from layman00/master
Merge pull request #2 from layman00/master

xx