Added marshal() and renamed unmarshall() to unmarshal().