Word delimiter support, fixes #2637, #2556, #2553, #2522

Word delimiter support, fixes #2637, #2556, #2553, #2522 #112