Revise the API format
Add a link to the page
Merge remote-tracking branch 'upstream/master'