jbryer Merge pull request #6 from hadley/patch-1