Fixing client

Signed-off-by: Yaniv Bronhaim <ybronhei@redhat.com>
Merge pull request #21 from bronhaim/some-fixes

Fixing client