fix a bug
merge the branch which fixed a bug
add dev.txt
merge the branch which add dev.txt