json output added.
Readinf from json added
Merge pull request #13 from lenarother/json

Json branch merged, all tests pass.