Add support for new Image
Merge pull request #280 from arv/new-image

Add support for new Image