alexcrichton Merge pull request #5 from mbrobbel/patch-1 …