Merge pull request #1 from krytaxion/master

Changed serialization mode