add dev branch
repaire master bug
finished from stash
Merge branch 'dev'