#gt-33 Fixed work 30m
Merge remote-tracking branch 'origin/master'