ENH: Simplifying the serialisation.
UT: Add unittest to confirm new serialisation model.
Merge pull request #236 from Debilski/feature/nicer-json