Iss 137

@kmiyake please merge it if you are OK !