Updated Serialization

Fixed Serialization to work with more complicated classes
Merge pull request #8 from bullsfan127/Jonathan

Updated Serialization