Added the good stuff.
Merge pull request #1 from SpinyCucumber/master

Added the good stuff.