Fixed serialization bugs
Merge pull request #103 from lukashaertel/master

Fixed serialization bugs
* Fixes #97