Added a catch for race conditions on the image download. Not foolproof, but pretty good.
Merge remote-tracking branch 'origin/master'