Merge pull request #1 from dickeylth/master

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

Merge pull request #1 from dickeylth/master