Added instruction to generate API
Fixed formatting
Auto-merge remote-tracking branch 'upstream/master'