Fix scroll. Close #430
Merge pull request #433 from godu/master

Fix scroll