Updated
Added support for custom image