Scroll Bug Fixed - Charley's code.
Merge pull request #39 from madhavc/develop

Scroll Bug Fixed - Charley's code.