script scroll repair
Merge branch 'update'