scroll fix
Merge pull request #1 from foltri/master

scroll fix