scrolling
Merge pull request #1 from weiShine/master

scrolling merge