#364: add image width/height