Merge pull request #10 from spinnytea/master

I merged a thing