Fix code style and improve coverage.
Change version to 2.0.5.
Merge branch 'release/2.0.5'