Merge branch 'dev'
add: two note
Merge branch 'master' into dev