Merge pull request #34 from yupe/master

UPD: merge with yupe/master
Merge pull request #35 from yupe/master

UPD: merge with yupe/master
Merge pull request #36 from yupe/master

UPD: merge with yupe/master
UPD: fix #605
Merge pull request #609 from angel-kulikov/master

UPD: fix #605