Moved Client methods to Remote
Merge remote branch 'origin/master'