Fixes
Merge pull request #2 from kotchuprik/fixes

Fixes