Merge pull request #1 from kissygalleryteam/master

5.0.0 fix #3