Merge pull request #273 from apprb/master

autoscroll fix