last fixes
Merge pull request #16 from artemkorolev/last_fixes

last fixes