fixed scroll issue on windows
update to upstream master
Merge pull request #268 from grbritz/master

Fixed scroll issue on windows