modify to support the message communication with message server
Merge branch 'master' of ssh://github.com/shahu/xhome