Merge pull request #6 from xiaosong/master

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

Merge pull request #6 from xiaosong/master