添加了新的方法
Merge branch 'zhangj1226_02' into staging