Merge author 's change.

update to author 's version