soukai53
Make generic for kashikiri
Merge branch 'kashikiri'