More work on JSON
Merge pull request #9 from HeisenBugDev/Json

More work on JSON