Fixed Marshaller error. Updated client-server protocol.