Merge branch 'release/2.0.0' into develop
Update API not be such a hassle.
Bump 2.1.0
Merge branch 'release/2.1.0'