Was nice this time.
Merge pull request #1 from ollyjsmith/master

I'm commenting on stuff.