Merge pull request #14 from shepherdwind/master

Auto merge by kpm server
Merge remote-tracking branch 'gallery/master'