Image optimization.
Merge pull request #452 from jamiestevens/image-opt

Image optimization.