Fix abbreviations to type <cr> as well
Add word
Merge branch 'master' into zaalbar