Merge pull request #108 from yupe/master

UPD: small fixes
UPD: fix install problems on 5 step
Merge pull request #1027 from angel-kulikov/master

UPD: fix install problems on 5 step