Better support for lower resolutions (Fixes #8)
Merge.