Merge pull request #1 from foltri/master

scroll fix
better
Merge branch 'gh-pages'