Merge pull request #83 from peachesandcorn/master

Stop that, you'll go blind!