merge:add setter and getter
Merge branch 'merge'