Updated
Merge pull request #352 from dreamsxin/messages

Updated