master3

Reverts scorpio102/kursa4#1