Merge pull request #26 from KittyTristy/working

goodbye json