mhetrick Merge pull request #1 from kant/patch-1