Merge pull request #5 from xiaosong/master

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

Merge pull request #5 from xiaosong/master