Better scanning method added.

Captions (filename) and albums (folder) are now supported.