Pichu's Endeavor, Take 2
Merge pull request #1303 from Fuzzysqurl/master

Pichu's Endeavor, Take 2