Issue #448 Added default image behaviour