@6 commit
merge shuntaro4 branch with @6