fixed bug
complete dev
Merge branch 'dev'