Death #97

Merged r-isitani merged 2 commits into nitta-lab-2018:master from nitta-lab-2018:death on 10 Jul 2018