Be flexible where simplejson comes from
2 files changed