update the documents & comments
Merge branch 'master' into develop