fixed serialization bugs
more serialization bugs
Merge remote-tracking branch 'origin/master'