Obj #153

Merged r-isitani merged 2 commits into nitta-lab-2018:master from nitta-lab-2018:obj on 2 Nov 2018