Added some JSON support but need to find a fix for constants
Merge pull request #28 from johnie/master

Added some JSON support but need to find a fix for constants