[#20] and [#57]
Merge branch 'master' of https://github.com/NTsvyatkov/itacademy