from Master to Marek
Merge remote-tracking branch 'origin/Marek'