Merge pull request #2 from tg123/master

update
Aug 25 patch
Merge pull request #87 from gdqyn/master

Aug 25 patch