Support for marshalling of non-objects, resolves #30