Better fix for "Made horizontal scrolling more intuitive" (See #36)

I reverted the commit from PR #36 and provided a new commit that does the job better.