Adds json serialization
Merge pull request #12 from localmed/MR-17/json-serialization

Adds json serialization