Fixed warnings due to signed int and nonreturn function for is_word
Mergerd changes from origin/master