pcikling?
Merge branch 'devel' into pickle
pickling unified with __getstate__ and __setstate__