Added serialization support
Removed TODO
Merge branch 'feature/serialization' into develop

* feature/serialization:
  Removed TODO
  Added serialization support
Added parser error tests