Merge pull request #1 from sy264115809/master

update
Merge pull request #2 from TedHacker/master

update2