Merge pull request #1 from kissygalleryteam/master

e