my additions
Merge pull request #1 from jkaberuka/connor

hmm, what's a pull request