Merge changes, accept response objects
Merge master