Merge pull request #7 from kissygalleryteam/master

Merge pull request #7 from xiaosong/master
修复bug
Merge pull request #8 from xiaosong/master

Auto merge by kpm server