Some fixes
Merge branch 'master' of https://github.com/Slicey4/homework_6