commit for master
commit for dev
second commit for master
fifth commit by wangxinlu