Feature/gallery

Merge after #71