update message
Merge pull request #5 from ErikFang/master

update message
Merge pull request #2 from dianping/master

merge