Merge pull request #10 from 306808700/master

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

Merge pull request #10 from 306808700/master