Compilation bugfix
deserialize exception version
Clean test output
merge master