method rename
Merge ../mosesdecoder into hieu