UPD: fix previous commit
Merge pull request #975 from angel-kulikov/master

UPD: small fixes