Merge branch 'release/v.1.0'
Add hotfix
Merge branch 'hotfix/fix1' into develop