Feature/image attributes

Re-submission of PR #967 with branch taken fresh from bolt/master and handles the use case raised in that PR.