there should actually be new tests this time...
Merge pull request #6 from catherinev/pair-rickytux,catherinev

there should actually be new tests this time...