some fixes
Merge pull request #1 from artempartos/fixes

some fixes