Attempting to fix serialization
Merge branch 'master' of https://github.com/tditada/so-tp2
Merge.