整理した
Merge branches 'dev' and 'dev' of https://github.com/hajipion/aiai into dev