support scrolling on all browsers
Merge branch 'master' into gh-pages