Changin default image size to 'undefined'
Merge branch 'develop'