various fixes
Merge pull request #10 from DKMudrechenko/master

various fixes