Serialization documentation
Bug fix