fix bug
fix one thousand
add "and" to yml for english
update version
Merge branch 'release/0.2.20' into develop

* release/0.2.20:
  update version
  add "and" to yml for english
  fix one thousand