Make it so it actually works.
Derp
Merge pull request #2 from ellzey/fixes

Make it so it actually works.