BugFixes1 #25

Merged r-hashime merged 9 commits into nitta-lab:main from nitta-lab:bugFixes1 on 7 Mar