json added
Merge branch 'load_from_json'