Merge pull request #1 from kissygalleryteam/master

update from kissygalleryteam
update
Merge pull request #1 from ppxu/master

update