free fuel. behavior for shop
Merge remote-tracking branch 'origin/master'