Merge pull request #18 from daniellemayne/develop

bugzids 4171 and 4187: enhanced images support