Confuse / Baton Pass fix
Confuse / Baton Pass fix+
Merge pull request #244 from Wavywavy/master

Confuse / Baton Pass Fix