Merge branch 'nari'
modify typo
modify typo too