force client 5.5 #120

* #120 rebased on top of the latest master