Fixed some bugs with wharehouse
Merge branch 'Refactor' of github.com:Hexanome4202/test_devoo into Refactor