JSON output added
JSON output added
Merge branch 'feature/json_output_feature' into develop