Merge branch 'raysmond'
fix bugs in messages
Merge branch 'master' into raysmond