Added support for image-width and image-height functions