UPD: fixing #469
Merge branch 'master' of github.com:angel-kulikov/yupe