reflected #231 in English version #271 #191

@btshimizukza 

Please review #271 #191