fixes scroll bug
Merge branch 'master' of https://github.com/jacob-l/wwm