1.1
1.1
Merge pull request #7 from kissygalleryteam/master

Merge pull request #6 from 306808700/master
Merge pull request #7 from 306808700/master

Auto merge by kpm server