Fixed Serializable interface

Forgot a couple of methods
Merge branch 'mauricio'