Merge pull request #1 from jcupitt/display-tweak-1

Display tweak 1
Merge remote-tracking branch 'upstream/master'