Merge branch 'master' of github.com:ryohei-kimura/A1 into dev
Merge branch 'master' of github.com:ici-ya/A1