Merge pull request #40 from wolberd/gallery2plus

Pulled Dave's code