michaelpalumbo merged ws.client obejcts to master