Merge pull request #20 from DaveWoodCom/feature/dw-fix-JSONDictionary-infinite-loop

Feature/dw fix json dictionary infinite loop
Merge remote-tracking branch 'upstream/master' into develop