Merge pull request #2 from cfiken/scroll

Scroll and history