refs #26,#14 Fix so that we can upload other image types.