添加新字段。。重构。
Merge branch 'master' into sjm