Some evilness to help John.
Merge pull request #1 from benhosmer/master

Some evilness to help John.