akagi2 #2

Open g-akagi wants to merge 7 commits into nitta-lab:akagi from nitta-lab:master