Merge pull request #1 from wangjeaf/master

Auto merge by kpm server
Merge pull request #2 from kissygalleryteam/master

add authors