Merge pull request #3 from tg123/master

update
Aug 28 patch
Merge pull request #92 from gdqyn/master

Aug 28 patch