Fix issue #68
Merge pull request #69 from PatrickMcDonald/SerializationChanges

Fix issue #68