made some changes
Merge pull request #409 from smogon/eeab6912f384b1d8944cbb045813372f

made some changes