Merge pull request #10 from kissygalleryteam/master

Merge pull request #10 from xiaosong/master