Fix #136

Merged y-ota merged 3 commits into nitta-lab-2018:master from nitta-lab-2018:fix on 16 Oct 2018