Revert pull request#220
Use serialize/unserialize methods instead of Marshal
Bump version to 3.1.0.2.0