josh Merge pull request #187 from kant/patch-2