Hoping this will settle merge conflicts
Merge pull request #45 from jasonerpenbeck/resp

Hoping this will settle merge conflicts