Updated v1.4 a bit especially the Marshaler.