Change to json
Merge branch 'vladimir'