Merge branch 'release/1.0'
Merge branch 'release/2.0'
Update Readme
Merge branch 'hotfix/2.1' into develop