Merge pull request #1 from tg123/master

update
Aug 21 patch
Merge pull request #85 from gdqyn/master

Aug 21 patch