Added controls for defining image size
Merge branch 'imagefixes' into dev