Add json file loading and parsing
Fix function name typo
Merge branch 'parsing'