Fix indent, Add generic marshalling versions with struct constraint
Update to 1.0.3