JSON fix.
Merge pull request #96 from chrisvoncsefalvay/jsonfix

JSON fix