Merge pull request #1 from shareyan/master

update
Merge pull request #26 from xingzhixin/master

Merge pull request #1 from shareyan/master