added more in topic branch for code review

added more in topic branch for code review
Merge pull request #1 from LianweiHuang/test-review

added more in topic branch for code review