#gt-24 Fixed work 20m
Merge remote-tracking branch 'origin/master'