Merge pull request #13 from torrmercury/Matt

Matt