Updating: minorly improving
Merge branch 'master' into translate_ja