[ja] merged contribution from Akito Tanaka