Bug fix
Merge branch 'master' of github.com:Hexanome4202/test_devoo