Separated serialization #23
Merge pull request #1 from voryx/master

Separated serialization #23