alexcrichton Merge pull request #3 from tcr/patch-1 …