refactor for Frank - revert!
Merge branch 'charme_json_v0.1' into develop