Merge branch 'release/2.0.0' into develop
Fix example config
Version to 2.1.0
Merge branch 'release/2.1.0'