change text from developer/yijun branch
Merge pull request #1 from yijunz/developer/yijun

change text from developer/yijun branch