add some comments.
Merge branch 'dev'

add some comments.