Autoscroll

(New PR since #124 was against master)