Merge branch 'liangyan'
add one statement in master branch
Merge branch 'master' into liangyan