Merge pull request #99 from yupe/master

UPD: merge with yupe/master
UPD: small fixes
Merge pull request #970 from angel-kulikov/master

UPD: small fixes