mikehumphrey Merge pull request #1 from dgam/patch-1