modified json.loads for compatibility with json and cleanup #44
arkeane wants to merge
arkeane:master into FraBle:mastermodified json.loads for compatibility with json and cleanup
arkeane:master into FraBle:master