All pictures now resized to the correct sizes.
Merge remote-tracking branch 'origin/master'