chang in api.rb
Merge remote-tracking branch 'ta/master'