client.rb
Merge branch 'develop'