Some fixes
Merge pull request #113 from penguin138/master

Nastya Torunova, 396, Shell
Все ок