fix bug in word.h, thanks David Leon Gil
Merge commit '5847031d7f1978a4ab3f923ea3bd2ec81a545d9b'

Conflicts:
	src/include/word.h