Either serialization module
Merge branch 'noam-almog-master'