Adjustment #29

Merged a-matsumoto merged 3 commits into nitta-lab-2018:master from nitta-lab-2018:adjustment on 3 Jul 2018