Fixes #27 - images slightly smaller and don't overflow
Merge branch 'iss27'