Nishino

incorporated review comments