pytajnik 2
Merge remote-tracking branch 'origin/CW' into Sim