Iss 118

@kmiyake hi please merge this if you are OK.