Update doc
Merge remote branch 'origin/master'; commit 'v0.2.3.6' into stable