Update with bug fix from master repository, and new endpoint.