Merge pull request #13 from 306808700/master

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

Merge pull request #13 from 306808700/master