Merge branch 'release/v1.0'
added description
Merge branch 'hotfix/v1.0.1' into develop