Some changes
Merge remote-tracking branch 'origin/translator' into translator