!12 v3.0.2

Merge pull request !12 from ejlchina/dev

!10 v3.0.1

Merge pull request !10 from ejlchina/dev

v2.5.1 ^_^

Merge branch 'dev' into v2.5.0

update doc