Merge pull request #1 from chishang/1.0

1.0
Merge pull request #3 from kissygalleryteam/master

Merge pull request #1 from chishang/1.0