Better uploaded images crop

Same as PR #39 but now to branch master.