Second part of code fix
Merge branch 'master' of https://github.com/bionic-university/igor-kozlov