stars
Merge pull request #1 from mangix/master

merge huishi