更新日志
merged
merge to 1.4.0
merge 1.4.1