Merge pull request #57 from MarkTonkinson/master

I'm so fancy