Merge pull request #1 from parshikov/master

Fix small errors
JSON format is added
Merge pull request #2 from parshikov/add_json

JSON format is added