kadai_@6 commit
Merge branch 'a-shingu'