recommit
updated the API Client class, and merge conflict