removed moving of cursor to the end due to user feedback
Merge branch 'develop'