Feature/mgamboa/2014 10 10/gallery