fix caret insertion. Close #23
Merge branch 'develop' into gh-pages