Neverending scrolling fixed
Merge branch 'master' into selectorFix