Merge pull request #7 from tg123/master

update
update nov 6
fix conflict
Merge branch 'tg123-master'
Merge pull request #101 from gdqyn/master

update nov 6