Entity: Word
Merge branch 'dev'