Final Final Elvisfix
Whoops
Merge pull request #1 from Heredth/newtoy

Welp
Merge pull request #819 from Heredth/Bleeding-Edge

Bugfixes