carpetscheme Merge pull request #2 from Keats/patch-2