ubuntu client complete
Merge pull request #25 from diegosarmentero/develop

ubuntu client complete