Fixed clicking setting hasSelection=true. Better wordUnderCursor.
Merge branch 'origin/master'