Merge pull request #168 from blackhydrogen/gallery

Gallery
Merge remote-tracking branch 'origin/master' into gallery