Bug fixes1git status git status
Merge branch 'release-1.0' into develop