avh4 Merge pull request #531 from avh4/json …