Merge pull request #1 from ZifengX/master

1
Unknown error
Merge pull request #3 from BladeWork/master

The second code from Renfa Feng