update scrollTop & scrollLeft to be called from window-dimensions
Merge branch 'master' into gh-pages