Merge pull request #2 from ccforward/master

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

Merge pull request #2 from ccforward/master