Fix issue with non identifier names
Merge pull request #279 from arv/fix-non-identifier-name

Fix issue with non identifier names
Add support for new Image
Merge pull request #280 from arv/new-image

Add support for new Image