Merge pull request #1 from wondger/master

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

Auto merge by kpm server
Merge pull request #3 from wondger/master

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

kjtype - type