Merge remote-tracking branch 'upstream/master'
Fixes to image file/name/category/tag output

Fixes to select xml files as well
Merge pull request #55 from abouffard/master

Fixes to export of image file name category and tag output.