for dev branch
modified first
add some comments
comment first
Merge branch 'dev'