Fixed some bugs
Merge branch 'Refactor' of https://github.com/Hexanome4201/test_devoo into Refactor