first working pair
Merge pull request #62 from hjacobs/master

first working pair