Merge tag '2.0' into develop

Release 2.0
Fixed setup config
Fixed typo
Fixed comment
Bumped version
Merge branch 'release/0.2.1'