reworked ImageUrlGenerator to allow external URLs
fixed merge conflict