last fixes - done
Merge pull request #4 from OlshevskyR/develop

last fixes - done