Merge pull request #10 from torrmercury/Matt

Matt