Merge pull request #1 from xiaosong/master

Auto merge by kpm server
Merge pull request #1 from kissygalleryteam/master

Merge pull request #1 from xiaosong/master