Implemented serialization
Merge origin/master