Shindo4 #11

Merged n-nitta merged 2 commits into nitta-lab-2020:master from nitta-lab-2020:shindo4 on 29 Apr 2020