commit to dev
commiting to doc
Merge branch 'doc'