fixes #8 and improves #7 - for 7 only problems when window too small now
Merge branch 'master' of github.com:ucam-cl-dtg/urop-2013-questions