[ja] merged changes from Akito Tanaka