Added missing serialization id's
Merge pull request #110 from GJRTimmer/development

Added missing serialization id's
Merge pull request #3 from peholmst/master

Update master from upstream/master