Merged update from @ionutvmi adding captions for setting files