Refactored out client and objects
Merge remote-tracking branch 'origin/master'