Optimize images - Fixes #8