Merge in imageLoader changed from @alaa-eddine, fixes #311