fix numbers being strings in JSON output
Merge branch 'dev'