fixed json formatting
Merge branch 'Eddie'