bug fix
bug fix:#2
Merge branch 'dev'