Merge pull request #2 from mailzwj/master

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

Merge pull request #2 from mailzwj/master