#10 hopefully fixed
Fixes for the json-generator