fix bug & 百度统计 See merge request !5
Release/2.0 See merge request !4
Release/2.0 See merge request !3
