PSR-2
WIP translation
Merge branch 'serializer' into yoopies