Added feature that shows captions on images

Also comments and code style improved