Merge pull request #10 from hannahstwinter/master

I screwed up...