Ensure images don't overflow
Merge pull request #135 from dstufft/prevent-wide-images

Ensure images don't overflow