small fix for pictures still needs testing
Merge remote-tracking branch 'origin'
Merge remote-tracking branch 'origin'