Matt Corallo Merge pull request #8 from jonathancross/patch-1