ServiceMessage constructor added
Merge branch 'server'