update merge
merge dev
update some word
Merge branch 'dev'
finish cmd.py