Merge pull request #1 from wss445566/master

pull