Merge branch 'master' of https://github.com/bun5jp/visualemotion
Merge branch 'master' of https://github.com/bun5jp/visualemotion
fix conflict