jeremyfelt Merge pull request #1 from blobaugh/patch-1