Client/Create fix
Merge branch 'master' of https://github.com/Grellinn/Company.git