reflected #215 in English version #220

Please review #220