Added image support, Fixes #20