Merge pull request #437 from Aleru/new-api-ping