Merge pull request #3 from xq831205gjf/master

Update
aa
Merge pull request #4 from xq831205gjf/master

update
Merge pull request #1 from ldkris/master

hhhhh