Merge pull request #177 from evoskuil/version2

Improve standardization of serializations.