merged with master. Added MessageServer class