bugzids 4171 and 4187: enhanced images support
Merge pull request #17 from daniellemayne/2014.03

bugzids 4171 and 4187: enhanced images support