Fixes with /pokemon
Merge pull request #346 from WriggleNightbug/master

Bugfixes with /pokemon