Beter handling of image creation.
Merge branch 'test' into dev