ref #77 : add client side
fix bug #77 + remove debug logs