Changed image property to use the same object that we use for image asse...

...ts fixes #91