Workaround for ID collision
Merge pull request #33 from y-higuchi/yoshi-master

Workaround for ID collision