Uses the new endpoint.json syntax
Merge pull request #1 from phstc/v5

Uses the new endpoint.json syntax