#gt-145 Fixed, work 1h
Merge remote-tracking branch 'origin/master'