word helper and entity done...
hehe
Merge remote-tracking branch 'origin'