Death march #96

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