Improvements on exceptions; better image resizement
Merge branch '4.0' into 4.1
Fix for images with same width and height
Merge branch '4.0' into 4.1