Merge branch 'release/v2.1.0' into develop
Fix error message line of undefined parser
Update README.md
Merge branch 'release/v2.2.0'