Add missing Word:: initialization
Merge branch 'master' into add_entity_test