merged Egorov Victor's branch into master