alexcrichton Merge pull request #5 from c0gent/master …