Merge branch 'dev' of github.com:itZhy/Rich into dev
Merge branch 'dev' of github.com:itZhy/Rich into dev