Merge pull request #3 from sy264115809/master

update3
Merge pull request #4 from TedHacker/master

Merge pull request #3 from sy264115809/master