Test2 #118

Merged y-ota merged 2 commits into nitta-lab-2018:master from nitta-lab-2018:Test2 on 3 Aug 2018