New version. Added image support for #24