add return statement in translate
Merge remote-tracking branch 'origin/master'