update for code review.
Merge pull request #1 from stonezhong/dev

update for code review.