r0343004

r0343004
Merge pull request #2 from wsx5031060310guy/master

r0343004 OK