Added last features
Merge branch 'master' of https://github.com/FlashLight13/Task2