Update marshal.go

Support unmarshalling TypeUUID