Правки ch30  #90 ch31 #94
Merge pull request #105 from MUlt1mate/master

Правки ch30  #90 ch31 #94