Merge branch 'ajqlee-fix-word-selection'