Problem with handling two deserializations solved.

All tests passed, code cleaned, documentation updated.