@alext updated with 98b09f9, also JSON client updated as discussed with 1445fdc