applied patch from Jyotesh implementing word-alignments