commit
Merge origin/master
Set the Serializable objects to implement the Serializable interface