Merge pull request #10 from snoppy911/master

Marge changes
Merge pull request #11 from snoppy911/ievgen.bogomolov

Merge pull request #10 from snoppy911/master