Merge branch 'develop'
Merge branch 'master' into develop
bug fixing

fix a bug, issues:2