Fixed #5 and removed simplejson