merge
merge
fix combo effects
merge
merge
Merge pull request #6 from tagia0212/master

fix combo effect