Image Captions in Gallery View

Will it be possible to make captions to each photo?

Preferably that are visible both in thumbnail view and with photo view? For the moment we can have filenames, but some more info for each photo would be perfect.

Thanks in advance