Hot fixes from corporate repo

Updates from svn
Merge pull request #20 from yglushonkova/master

Hot fixes