Merge pull request #2 from steipete/master

Update from steipete:master
Fix caret scrolling
Merge pull request #17 from hpique/caretFix

Caret fix