a-shingu @3 merge
Merge branch 'a-shingu'